From ce626621de04d0ce10835c0be77cdddbb42571cd Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 16 Feb 2022 23:23:48 +0100 Subject: [PATCH] Update to version 0.10.2; Fixes RHBZ#2030056 --- .gitignore | 2 ++ .rust2rpm.conf | 5 +++++ rust-sha2.spec | 34 ++++++++++++++-------------------- sha2-fix-metadata.diff | 21 --------------------- sources | 2 +- 5 files changed, 22 insertions(+), 42 deletions(-) create mode 100644 .rust2rpm.conf delete mode 100644 sha2-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 2b542e0..9df2bc8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /sha2-0.9.3.crate /sha2-0.9.5.crate /sha2-0.9.8.crate +/sha2-0.10.1.crate +/sha2-0.10.2.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..ab77a7d --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,5 @@ +[DEFAULT] +unwanted-features = + asm + asm-aarch64 + sha2-asm diff --git a/rust-sha2.spec b/rust-sha2.spec index acb300b..77fbcd3 100644 --- a/rust-sha2.spec +++ b/rust-sha2.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate sha2 Name: rust-%{crate} -Version: 0.9.8 +Version: 0.10.2 Release: %autorelease Summary: Pure Rust implementation of the SHA-2 hash function family @@ -13,14 +13,8 @@ Summary: Pure Rust implementation of the SHA-2 hash function family License: MIT or ASL 2.0 URL: https://crates.io/crates/sha2 Source: %{crates_source} -# Initial patched metadata -# * remove optional assembly features (only available for x86 and aarch64) -Patch0: sha2-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -36,12 +30,12 @@ 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 -%doc README.md CHANGELOG.md +%license LICENSE-APACHE LICENSE-MIT +%doc CHANGELOG.md README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -50,8 +44,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 @@ -62,8 +56,8 @@ BuildArch: noarch %description -n %{name}+compress-devel %{_description} -This package contains library source intended for building other packages -which use "compress" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "compress" feature of the "%{crate}" crate. %files -n %{name}+compress-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -74,8 +68,8 @@ BuildArch: noarch %description -n %{name}+force-soft-devel %{_description} -This package contains library source intended for building other packages -which use "force-soft" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "force-soft" feature of the "%{crate}" crate. %files -n %{name}+force-soft-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -86,8 +80,8 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sha2-fix-metadata.diff b/sha2-fix-metadata.diff deleted file mode 100644 index c6158ab..0000000 --- a/sha2-fix-metadata.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- sha2-0.9.8/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sha2-0.9.8/Cargo.toml 2021-09-29T15:54:59.898165+00:00 -@@ -36,9 +36,6 @@ - [dependencies.opaque-debug] - version = "0.3" - --[dependencies.sha2-asm] --version = "0.6.1" --optional = true - [dev-dependencies.digest] - version = "0.9" - features = ["dev"] -@@ -47,8 +44,6 @@ - version = "0.2" - - [features] --asm = ["sha2-asm"] --asm-aarch64 = ["asm"] - compress = [] - default = ["std"] - force-soft = [] diff --git a/sources b/sources index 4492344..b77cca5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sha2-0.9.8.crate) = 4bd858f67a3ee5a22769aaf4161d823884e112f99911d5461cafe746a19fafd2d8946eb3aa234953efa06a4dcf7becda70db6721c0d4a9b6f1fb670f31f6343d +SHA512 (sha2-0.10.2.crate) = 20b8217ce9b56fb5f2c1d71d3555889bcfcf5e40fb7fe0eec23479d384dfcd504f1046d6a12dcbb5072813792992b45261e664e9e8e14eb90a641e94336eb4d2