From 9b36bf5b9fc336174371455bc850030e02ee6c89 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 5 Nov 2020 13:35:30 +0100
Subject: [PATCH] update to version 0.9.2

---
 .gitignore              |  1 +
 rust-sha-1.spec         | 55 ++++++++++-------------------------------
 sha-1-fix-metadata.diff | 27 ++++++++++++++++++++
 sources                 |  2 +-
 4 files changed, 42 insertions(+), 43 deletions(-)
 create mode 100644 sha-1-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index c86204a..c72d3b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /sha-1-0.8.2.crate
 /sha-1-0.9.0.crate
 /sha-1-0.9.1.crate
+/sha-1-0.9.2.crate
diff --git a/rust-sha-1.spec b/rust-sha-1.spec
index 6e980c8..abe4187 100644
--- a/rust-sha-1.spec
+++ b/rust-sha-1.spec
@@ -5,14 +5,17 @@
 %global crate sha-1
 
 Name:           rust-%{crate}
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        SHA-1 hash function
 
 # Upstream license specification: MIT OR Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/sha-1
 Source:         %{crates_source}
+# Initial patched metadata
+# * remove non-default assembly features (only available for x86 and aarch64)
+Patch0:         sha-1-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -52,52 +55,16 @@ 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
+%package     -n %{name}+force-soft-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+asm-devel %{_description}
+%description -n %{name}+force-soft-devel %{_description}
 
 This package contains library source intended for building other packages
-which use "asm" feature of "%{crate}" crate.
+which use "force-soft" 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}+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}+sha1-asm-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+sha1-asm-devel %{_description}
-
-This package contains library source intended for building other packages
-which use "sha1-asm" feature of "%{crate}" crate.
-
-%files       -n %{name}+sha1-asm-devel
+%files       -n %{name}+force-soft-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %package     -n %{name}+std-devel
@@ -131,6 +98,10 @@ which use "std" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Thu Nov 05 2020 Fabio Valentini <decathorpe@gmail.com> - 0.9.2-1
+- Update to version 0.9.2.
+- Fixes RHBZ#1894127
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sha-1-fix-metadata.diff b/sha-1-fix-metadata.diff
new file mode 100644
index 0000000..1209de6
--- /dev/null
+++ b/sha-1-fix-metadata.diff
@@ -0,0 +1,27 @@
+--- sha-1-0.9.2/Cargo.toml	2020-11-03T15:01:40+00:00
++++ sha-1-0.9.2/Cargo.toml	2020-11-05T12:31:19.842614+00:00
+@@ -37,9 +37,6 @@
+ [dependencies.opaque-debug]
+ version = "0.3"
+ 
+-[dependencies.sha1-asm]
+-version = "0.4"
+-optional = true
+ [dev-dependencies.digest]
+ version = "0.9"
+ features = ["dev"]
+@@ -48,13 +45,9 @@
+ version = "0.2"
+ 
+ [features]
+-asm = ["sha1-asm", "libc"]
+-asm-aarch64 = ["asm"]
+ 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 7b702db..73eeeee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sha-1-0.9.1.crate) = 75ef1946aadd4f64f1a1757b5125afbf9d2ac0a176e259aa390cefe140aca0bffc23400083fa94480b523b70fb12b30c932b7541651e72fbff9032d585cbcf5e
+SHA512 (sha-1-0.9.2.crate) = 7ab98753f5d4b08dcf59c254bbd2d3e9576263b410b09a261d4020b7a44d68fa5f75dae1a548deb1f77c98dad87cd5417bfa1e969e9fab6aa6092d1a5ad9268a