From 5f913caa52fa344ba625a3962570e4f0ba8530a3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 16 Mar 2022 15:55:10 +0100 Subject: [PATCH] Update to version 0.24.0; Fixes RHBZ#2029485 --- .gitignore | 1 + rust-sequoia-net.spec | 53 +++++++++++++++++------------------ sequoia-net-fix-metadata.diff | 12 ++++---- sources | 2 +- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 67870e2..2be1acc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /sequoia-net-0.23.0.crate +/sequoia-net-0.24.0.crate diff --git a/rust-sequoia-net.spec b/rust-sequoia-net.spec index b4699ba..905a269 100644 --- a/rust-sequoia-net.spec +++ b/rust-sequoia-net.spec @@ -1,17 +1,16 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate sequoia-net Name: rust-%{crate} -Version: 0.23.0 +Version: 0.24.0 Release: %autorelease Summary: Network services for OpenPGP -# Upstream license specification: GPL-2.0-or-later -# https://gitlab.com/sequoia-pgp/sequoia/-/issues/708 -License: GPLv2+ +# Upstream license specification: LGPL-2.0-or-later +License: LGPLv2+ URL: https://crates.io/crates/sequoia-net Source: %{crates_source} # Initial patched metadata @@ -19,11 +18,8 @@ Source: %{crates_source} Patch0: sequoia-net-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Network services for OpenPGP.} @@ -36,12 +32,13 @@ 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 -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE.txt +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +46,11 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+compression-devel Summary: %{summary} @@ -61,11 +58,11 @@ BuildArch: noarch %description -n %{name}+compression-devel %{_description} -This package contains library source intended for building other packages -which use "compression" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "compression" feature of the "%{crate}" crate. %files -n %{name}+compression-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+compression-bzip2-devel Summary: %{summary} @@ -73,11 +70,11 @@ BuildArch: noarch %description -n %{name}+compression-bzip2-devel %{_description} -This package contains library source intended for building other packages -which use "compression-bzip2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "compression-bzip2" feature of the "%{crate}" crate. %files -n %{name}+compression-bzip2-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+compression-deflate-devel Summary: %{summary} @@ -85,11 +82,11 @@ BuildArch: noarch %description -n %{name}+compression-deflate-devel %{_description} -This package contains library source intended for building other packages -which use "compression-deflate" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "compression-deflate" feature of the "%{crate}" crate. %files -n %{name}+compression-deflate-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+crypto-nettle-devel Summary: %{summary} @@ -97,11 +94,11 @@ BuildArch: noarch %description -n %{name}+crypto-nettle-devel %{_description} -This package contains library source intended for building other packages -which use "crypto-nettle" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "crypto-nettle" feature of the "%{crate}" crate. %files -n %{name}+crypto-nettle-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/sequoia-net-fix-metadata.diff b/sequoia-net-fix-metadata.diff index 6cf6355..7a27a5d 100644 --- a/sequoia-net-fix-metadata.diff +++ b/sequoia-net-fix-metadata.diff @@ -1,10 +1,10 @@ ---- sequoia-net-0.23.0/Cargo.toml 2021-01-21T13:57:56+00:00 -+++ sequoia-net-0.23.0/Cargo.toml 2021-04-07T11:42:11.498117+00:00 -@@ -64,7 +64,6 @@ - version = "0.1.2" +--- sequoia-net-0.24.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-net-0.24.0/Cargo.toml 2022-03-16T10:56:55.150026+00:00 +@@ -79,7 +79,6 @@ [dev-dependencies.rand] version = "0.7" + features = ["getrandom"] -default-features = false - [dev-dependencies.tokio] - version = "0.2.19" + [features] + compression = ["sequoia-openpgp/compression"] diff --git a/sources b/sources index 7fc0c4b..f0a3263 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequoia-net-0.23.0.crate) = 85378597e1d4f6861f6e17a938e49eff53af66c38cac870cea2437d1fa46f3889e1b5e2549921b9e2c64563b0f29eb91b1e97dbadb41dfdaa164b1868d20d78c +SHA512 (sequoia-net-0.24.0.crate) = 4171321068894fa7f322d73eb6d0094cffd7bbeff4d810756eacbf4eff7bd43389f50dc1b26fbd697ae78c7c65723b79b5831f0e14a8ce6f67079f12f1c5b5c2