diff --git a/.gitignore b/.gitignore index e56b31e..9237b69 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /salsa20-0.8.1.crate +/salsa20-0.10.2.crate diff --git a/rust-salsa20.spec b/rust-salsa20.spec index a6cf8a9..96d56e9 100644 --- a/rust-salsa20.spec +++ b/rust-salsa20.spec @@ -1,25 +1,19 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate salsa20 -Name: rust-%{crate} -Version: 0.8.1 +Name: rust-salsa20 +Version: 0.10.2 Release: %autorelease Summary: Salsa20 Stream Cipher -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/salsa20 Source: %{crates_source} -# Initial patched metadata -# * relax zeroize dependency (MSRV is irrelevant for Fedora) -Patch0: salsa20-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Salsa20 Stream Cipher.} @@ -36,9 +30,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,43 +46,19 @@ 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 - -%package -n %{name}+expose-core-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+expose-core-devel %{_description} - -This package contains library source intended for building other packages which -use the "expose-core" feature of the "%{crate}" crate. - -%files -n %{name}+expose-core-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+hsalsa20-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+hsalsa20-devel %{_description} - -This package contains library source intended for building other packages which -use the "hsalsa20" feature of the "%{crate}" crate. - -%files -n %{name}+hsalsa20-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+xsalsa20-devel +%package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+xsalsa20-devel %{_description} +%description -n %{name}+std-devel %{_description} This package contains library source intended for building other packages which -use the "xsalsa20" feature of the "%{crate}" crate. +use the "std" feature of the "%{crate}" crate. -%files -n %{name}+xsalsa20-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+std-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+zeroize-devel Summary: %{summary} @@ -98,7 +70,7 @@ This package contains library source intended for building other packages which use the "zeroize" feature of the "%{crate}" crate. %files -n %{name}+zeroize-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/salsa20-fix-metadata.diff b/salsa20-fix-metadata.diff deleted file mode 100644 index 0910a44..0000000 --- a/salsa20-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- salsa20-0.8.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ salsa20-0.8.1/Cargo.toml 2021-12-20T12:29:18.816554+00:00 -@@ -28,7 +28,7 @@ - version = "0.3" - - [dependencies.zeroize] --version = "=1.3" -+version = "1.3" - optional = true - default-features = false - [dev-dependencies.cipher] diff --git a/sources b/sources index 5f013f1..87a3e1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salsa20-0.8.1.crate) = 630186b2c3f578eb2c17c57cb7902580e1bdc2176a179a7ad443494aab3247eb4776836e52caaee2fb3ba078830c63a93d2b458cd4f3e01d4ccebb37a8b1c9f6 +SHA512 (salsa20-0.10.2.crate) = 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0