From b6cafcd291474f9d7e6ac88f82936bd7261313f9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 23 Jun 2019 10:31:52 +0200 Subject: [PATCH] Regenerate Signed-off-by: Igor Gnatenko --- rust-sha-1.spec | 56 ++++++++++++++++++++++++++++------------- sha-1-fix-metadata.diff | 25 ++++++------------ 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/rust-sha-1.spec b/rust-sha-1.spec index d66909b..a3e3a5c 100644 --- a/rust-sha-1.spec +++ b/rust-sha-1.spec @@ -1,13 +1,12 @@ -# Generated by rust2rpm -# We don't have the dev dependencies packaged yet, so disable the tests for now. -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate sha-1 Name: rust-%{crate} Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SHA-1 hash function # Upstream license specification: MIT OR Apache-2.0 @@ -15,25 +14,18 @@ License: MIT or ASL 2.0 URL: https://crates.io/crates/sha-1 Source: %{crates_source} # Initial patched metadata -# sha-1-asm is x86-specific and is also optional, so we can drop it for now. +# * Update hex-literal to 0.2, https://github.com/RustCrypto/hashes/pull/85 Patch0: sha-1-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(block-buffer/default) >= 0.7.0 with crate(block-buffer/default) < 0.8.0) -BuildRequires: (crate(digest/default) >= 0.8.0 with crate(digest/default) < 0.9.0) -BuildRequires: (crate(digest/std) >= 0.8.0 with crate(digest/std) < 0.9.0) -BuildRequires: (crate(fake-simd/default) >= 0.1.0 with crate(fake-simd/default) < 0.2.0) -BuildRequires: (crate(opaque-debug/default) >= 0.2.0 with crate(opaque-debug/default) < 0.3.0) -%if %{with check} -BuildRequires: (crate(digest/default) >= 0.8.0 with crate(digest/default) < 0.9.0) -BuildRequires: (crate(digest/dev) >= 0.8.0 with crate(digest/dev) < 0.9.0) -BuildRequires: (crate(hex-literal/default) >= 0.1.0 with crate(hex-literal/default) < 0.2.0) -%endif -%global _description \ -SHA-1 hash function. +%global _description %{expand: +SHA-1 hash function.} %description %{_description} @@ -62,6 +54,30 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/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}/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 +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch @@ -78,6 +94,9 @@ which use "std" feature of "%{crate}" crate. %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -90,6 +109,9 @@ which use "std" feature of "%{crate}" crate. %endif %changelog +* Sun Jun 23 10:30:56 CEST 2019 Igor Gnatenko - 0.8.1-3 +- Regenerate + * Mon Feb 25 2019 Igor Gnatenko - 0.8.1-2 - Trivial fixes diff --git a/sha-1-fix-metadata.diff b/sha-1-fix-metadata.diff index 8e98185..6fe95d1 100644 --- a/sha-1-fix-metadata.diff +++ b/sha-1-fix-metadata.diff @@ -1,20 +1,11 @@ ---- sha-1-0.8.1/Cargo.toml 1969-12-31T19:00:00-05:00 -+++ sha-1-0.8.1/Cargo.toml 2019-02-23T13:15:01.940311-05:00 -@@ -35,9 +35,6 @@ - [dependencies.opaque-debug] - version = "0.2" - --[dependencies.sha1-asm] --version = "0.4" --optional = true - [dev-dependencies.digest] - version = "0.8" +--- sha-1-0.8.1/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ sha-1-0.8.1/Cargo.toml 2019-06-23T08:30:56.452978+00:00 +@@ -43,7 +43,7 @@ features = ["dev"] -@@ -46,7 +43,6 @@ - version = "0.1" + + [dev-dependencies.hex-literal] +-version = "0.1" ++version = "0.2" [features] --asm = ["sha1-asm"] - default = ["std"] - std = ["digest/std"] - [badges.travis-ci] + asm = ["sha1-asm"]