diff --git a/.gitignore b/.gitignore index 742ca31..bea65ab 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /sha2-0.8.2.crate /sha2-0.9.0.crate /sha2-0.9.1.crate +/sha2-0.9.2.crate diff --git a/rust-sha2.spec b/rust-sha2.spec index 57ff1f3..018691b 100644 --- a/rust-sha2.spec +++ b/rust-sha2.spec @@ -5,14 +5,17 @@ %global crate sha2 Name: rust-%{crate} -Version: 0.9.1 -Release: 2%{?dist} -Summary: SHA-2 hash functions +Version: 0.9.2 +Release: 1%{?dist} +Summary: Pure Rust implementation of the SHA-2 hash function family # Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/sha2 Source: %{crates_source} +# Initial patched metadata +# * remove non-default assembly features (only available for x86 and aarch64) +Patch0: sha2-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -53,30 +56,6 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+asm-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+asm-devel %{_description} - -This package contains library source intended for building other packages -which use "asm" feature of "%{crate}" crate. - -%files -n %{name}+asm-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+asm-aarch64-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+asm-aarch64-devel %{_description} - -This package contains library source intended for building other packages -which use "asm-aarch64" feature of "%{crate}" crate. - -%files -n %{name}+asm-aarch64-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+compress-devel Summary: %{summary} BuildArch: noarch @@ -89,28 +68,16 @@ which use "compress" feature of "%{crate}" crate. %files -n %{name}+compress-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+libc-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+libc-devel %{_description} - -This package contains library source intended for building other packages -which use "libc" feature of "%{crate}" crate. - -%files -n %{name}+libc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+sha2-asm-devel +%package -n %{name}+force-soft-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+sha2-asm-devel %{_description} +%description -n %{name}+force-soft-devel %{_description} This package contains library source intended for building other packages -which use "sha2-asm" feature of "%{crate}" crate. +which use "force-soft" feature of "%{crate}" crate. -%files -n %{name}+sha2-asm-devel +%files -n %{name}+force-soft-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+std-devel @@ -144,6 +111,10 @@ which use "std" feature of "%{crate}" crate. %endif %changelog +* Thu Nov 05 2020 Fabio Valentini - 0.9.2-1 +- Update to version 0.9.2. +- Fixes RHBZ#1894128 + * Wed Jul 29 2020 Fedora Release Engineering - 0.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sha2-fix-metadata.diff b/sha2-fix-metadata.diff new file mode 100644 index 0000000..594549e --- /dev/null +++ b/sha2-fix-metadata.diff @@ -0,0 +1,28 @@ +--- sha2-0.9.2/Cargo.toml 2020-11-03T15:01:48+00:00 ++++ sha2-0.9.2/Cargo.toml 2020-11-05T12:22:56.021167+00:00 +@@ -34,9 +34,6 @@ + [dependencies.opaque-debug] + version = "0.3" + +-[dependencies.sha2-asm] +-version = "0.5" +-optional = true + [dev-dependencies.digest] + version = "0.9" + features = ["dev"] +@@ -45,14 +42,10 @@ + version = "0.2" + + [features] +-asm = ["sha2-asm", "libc"] +-asm-aarch64 = ["asm"] + compress = [] + default = ["std"] + force-soft = [] + std = ["digest/std"] +-[target."cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))".dependencies.libc] +-version = "0.2.80" +-optional = true ++ + [target."cfg(any(target_arch = \"x86\", target_arch = \"x86_64\"))".dependencies.cpuid-bool] + version = "0.1" diff --git a/sources b/sources index b383578..14fd68e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sha2-0.9.1.crate) = 451b44acbd6671e0038ef886a6f3566f0f028906cfeb97e22a38ff3efda6d01efb5de40b6c7a75e7458620311f68b3fe26a4dd3159d1647b250de8219d334435 +SHA512 (sha2-0.9.2.crate) = 8d028a011b22f9e89a29513f4c25b2cd551aa71ff61f5247b31bea9d3291af8fd340ec0b33496b68e4057be30072fa50d81a2d8293ce248eeab1f2035e6a05d6