From ca7152b7d8fad1da649abe057be86c2e9cb80ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lauzier?= Date: Fri, 28 Jan 2022 00:50:31 -0500 Subject: [PATCH] Update for rust2rpm 20 and remove nix downgrade --- alsa-fix-metadata.diff | 11 ----------- rust-alsa.spec | 18 ++++++------------ 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 alsa-fix-metadata.diff diff --git a/alsa-fix-metadata.diff b/alsa-fix-metadata.diff deleted file mode 100644 index e9cab9c..0000000 --- a/alsa-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- alsa-0.6.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ alsa-0.6.0/Cargo.toml 2021-11-03T23:18:25.317265+00:00 -@@ -33,7 +33,7 @@ - version = "0.2.105" - - [dependencies.nix] --version = "0.23" -+version = "0.22" - [badges.is-it-maintained-issue-resolution] - repository = "diwic/alsa-rs" - diff --git a/rust-alsa.spec b/rust-alsa.spec index 6796cc9..ec5eb01 100644 --- a/rust-alsa.spec +++ b/rust-alsa.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 # Deactivate tests because they need a sound card # https://github.com/diwic/alsa-rs/issues/71 %bcond_with check @@ -15,14 +15,8 @@ Summary: Thin but safe wrappers for ALSA (Linux sound API) License: ASL 2.0 or MIT URL: https://crates.io/crates/alsa Source: %{crates_source} -# Initial patched metadata -# Downgrade nix to version 0.22 -Patch0: alsa-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -37,11 +31,11 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-MIT LICENSE-APACHE +%license LICENSE-APACHE LICENSE-MIT %doc README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ @@ -51,8 +45,8 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml