The package rpms/rust-sequoia-sqv.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-sequoia-sqv.git/commit/?id=f....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 9f2fc016f450b5ab52ec344c2ef45576188c2e87
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Apr 18 23:31:08 2024 +0200
Update to version 1.2.1; Fixes RHBZ#2275941
diff --git a/.gitignore b/.gitignore
index 52b12e4..1af729f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
/sequoia-sqv-1.0.0.crate
/sequoia-sqv-1.1.0.crate
+/sequoia-sqv-1.2.0.crate
+/sequoia-sqv-1.2.1.crate
diff --git a/rust-sequoia-sqv.spec b/rust-sequoia-sqv.spec
index cb3f741..be37c92 100644
--- a/rust-sequoia-sqv.spec
+++ b/rust-sequoia-sqv.spec
@@ -1,10 +1,10 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
%bcond_without check
%global crate sequoia-sqv
Name: rust-sequoia-sqv
-Version: 1.1.0
+Version: 1.2.1
Release: %autorelease
Summary: Simple OpenPGP signature verification program
@@ -12,10 +12,12 @@ License: GPL-2.0-or-later
URL:
https://crates.io/crates/sequoia-sqv
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
+# * switch crypto backend from Nettle to OpenSSL
# * exclude files that are only useful for upstream development
+# * drop features for unsupported crypto backends
Patch: sequoia-sqv-fix-metadata.diff
-BuildRequires: rust-packaging >= 23
+BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
A simple OpenPGP signature verification program.}
@@ -25,17 +27,18 @@ A simple OpenPGP signature verification program.}
%package -n %{crate}
Summary: %{summary}
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# Apache-2.0
# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
# BSL-1.0
# GPL-2.0-or-later
# LGPL-2.0-or-later
-# LGPL-3.0 OR GPL-2.0 OR GPL-3.0
# MIT
# MIT OR Apache-2.0
# MIT OR Apache-2.0 OR Zlib
# Unlicense OR MIT
# Zlib OR Apache-2.0 OR MIT
-License: BSL-1.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT AND
Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR
Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
+License: GPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND LGPL-2.0-or-later AND MIT
AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR
Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
%description -n %{crate} %{_description}
@@ -45,11 +48,13 @@ License: BSL-1.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND
MIT AND U
%license LICENSE.dependencies
%doc README.md
%{_bindir}/sqv
+%{_mandir}/man1/sqv*
+%{bash_completions_dir}/sqv.bash
+%{fish_completions_dir}/sqv.fish
+%{zsh_completions_dir}/_sqv
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-# remove integration tests (assert-cli is broken during RPM builds)
-rm -r tests
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
@@ -62,6 +67,16 @@ rm -r tests
%install
%cargo_install
+# install manual pages
+mkdir -p %{buildroot}/%{_mandir}/man1
+cp -pav target/release/build/%{crate}-*/out/man-pages/sqv*.1
%{buildroot}/%{_mandir}/man1/
+# install shell completions
+install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sqv.bash \
+ %{buildroot}/%{bash_completions_dir}/sqv.bash
+install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sqv.fish \
+ %{buildroot}/%{fish_completions_dir}/sqv.fish
+install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sqv \
+ %{buildroot}/%{zsh_completions_dir}/_sqv
%if %{with check}
%check
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..a44c865
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,27 @@
+[package]
+cargo-toml-patch-comments = [
+ "switch crypto backend from Nettle to OpenSSL",
+ "exclude files that are only useful for upstream development",
+ "drop features for unsupported crypto backends",
+]
+extra-files = [
+ "%{_mandir}/man1/sqv*",
+ "%{bash_completions_dir}/sqv.bash",
+ "%{fish_completions_dir}/sqv.fish",
+ "%{zsh_completions_dir}/_sqv",
+]
+
+[scripts]
+install.post = [
+ "# install manual pages",
+ "mkdir -p %{buildroot}/%{_mandir}/man1",
+ "cp -pav target/release/build/%{crate}-*/out/man-pages/sqv*.1
%{buildroot}/%{_mandir}/man1/",
+ "# install shell completions",
+ "install -Dpm 0644
target/release/build/%{crate}-*/out/shell-completions/sqv.bash \\",
+ " %{buildroot}/%{bash_completions_dir}/sqv.bash",
+ "install -Dpm 0644
target/release/build/%{crate}-*/out/shell-completions/sqv.fish \\",
+ " %{buildroot}/%{fish_completions_dir}/sqv.fish",
+ "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sqv
\\",
+ " %{buildroot}/%{zsh_completions_dir}/_sqv",
+]
+
diff --git a/sequoia-sqv-fix-metadata.diff b/sequoia-sqv-fix-metadata.diff
index 98439fd..d0eb612 100644
--- a/sequoia-sqv-fix-metadata.diff
+++ b/sequoia-sqv-fix-metadata.diff
@@ -1,11 +1,17 @@
---- sequoia-sqv-1.1.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ sequoia-sqv-1.1.0/Cargo.toml 2023-08-07T14:20:13.647143+00:00
-@@ -14,7 +14,7 @@
- name = "sequoia-sqv"
- version = "1.1.0"
- authors = ["Justus Winter <justus(a)sequoia-pgp.org>", "Kai Michaelis
<kai(a)sequoia-pgp.org>", "Neal H. Walfield
<neal(a)sequoia-pgp.org>"]
--exclude = [".ci", ".gitlab-ci.yml"]
-+exclude = [".ci", ".gitlab-ci.yml", "Makefile",
"make-usage.sh"]
- description = "A simple OpenPGP signature verification program"
- homepage = "https://sequoia-pgp.org/"
- documentation = "https://docs.sequoia-pgp.org/sqv"
+--- sequoia-sqv-1.2.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ sequoia-sqv-1.2.1/Cargo.toml 2024-04-19T12:33:50.962487+00:00
+@@ -98,13 +98,9 @@
+ version = "0.6"
+
+ [features]
+-crypto-botan = ["sequoia-openpgp/crypto-botan"]
+-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
+-crypto-cng = ["sequoia-openpgp/crypto-cng"]
+ crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
+ crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
+-crypto-rust = ["sequoia-openpgp/crypto-rust"]
+-default = ["crypto-nettle"]
++default = ["crypto-openssl"]
+
+ [badges.gitlab]
+ repository = "sequoia-pgp/sequoia"
diff --git a/sources b/sources
index f279c65..12335d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-sqv-1.1.0.crate) =
cc8670ab1aae4893675f94b07bca8231531898bcbbd7da435d0f82a80be2900782916acb5b7f26faaaf9d417093a33fb0aceb796b1cddf4ed6bf1afcf2973af7
+SHA512 (sequoia-sqv-1.2.1.crate) =
9e784b64b8c2b84b6e89abfecd49083b8cc37809a4879ec0fa4201e79b31cbf06562c07773b0b6ebc31990034c70172f2dc59ba4b0c3af1e8bdc23e9dec29cd8
commit dce9c27a962d54c8e4b376115db39e39e6132475
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jan 27 00:00:41 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit f0036d11148f26416a8a9e966431dd6e207e03b7
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Mon Aug 7 16:26:21 2023 +0200
Regenerate with rust2rpm v24
diff --git a/LICENSE.dependencies b/LICENSE.dependencies
deleted file mode 100644
index 5adc768..0000000
--- a/LICENSE.dependencies
+++ /dev/null
@@ -1,97 +0,0 @@
-0BSD or MIT or ASL 2.0: rust-adler 1.0.2
-ASL 2.0 or MIT: rust-addr2line 0.17.0
-ASL 2.0 or MIT: rust-ascii-canvas 3.0.0
-ASL 2.0 or MIT: rust-autocfg 1.1.0
-ASL 2.0 or MIT: rust-cexpr 0.6.0
-ASL 2.0 or MIT: rust-gimli 0.26.1
-ASL 2.0 or MIT: rust-hashbrown 0.11.2
-ASL 2.0 or MIT: rust-indexmap 1.8.0
-ASL 2.0 or MIT: rust-lalrpop 0.19.7
-ASL 2.0 or MIT: rust-lalrpop-util 0.19.7
-ASL 2.0 or MIT: rust-lock_api 0.4.6
-ASL 2.0 or MIT: rust-object 0.27.1
-ASL 2.0 or MIT: rust-parking_lot0.11 0.11.2
-ASL 2.0 or MIT: rust-parking_lot_core0.8 0.8.5
-ASL 2.0 or MIT: rust-peeking_take_while 0.1.2
-ASL 2.0 or MIT: rust-rustc-hash 1.1.0
-ASL 2.0: rust-clang-sys 1.3.1
-BSD: rust-bindgen 0.59.2
-BSD: rust-instant 0.1.12
-CC0: rust-tiny-keccak 2.0.2
-LGPLv2+: rust-buffered-reader 1.1.2
-LGPLv2+: rust-sequoia-openpgp 1.8.0
-LGPLv3 or GPLv2 or GPLv3: rust-nettle 7.1.0
-LGPLv3 or GPLv2 or GPLv3: rust-nettle-sys 2.1.0
-MIT or ASL 2.0 or zlib: rust-tinyvec_macros 0.1.0
-MIT or ASL 2.0: rust-anyhow 1.0.55
-MIT or ASL 2.0: rust-backtrace 0.3.64
-MIT or ASL 2.0: rust-base64 0.13.0
-MIT or ASL 2.0: rust-bit-set 0.5.2
-MIT or ASL 2.0: rust-bit-vec 0.6.3
-MIT or ASL 2.0: rust-bitflags 1.3.2
-MIT or ASL 2.0: rust-cc 1.0.73
-MIT or ASL 2.0: rust-cfg-if 1.0.0
-MIT or ASL 2.0: rust-chrono 0.4.19
-MIT or ASL 2.0: rust-diff 0.1.12
-MIT or ASL 2.0: rust-digest0.9 0.9.0
-MIT or ASL 2.0: rust-dirs-next 2.0.0
-MIT or ASL 2.0: rust-dirs-sys-next 0.1.2
-MIT or ASL 2.0: rust-dyn-clone 1.0.4
-MIT or ASL 2.0: rust-either 1.6.1
-MIT or ASL 2.0: rust-ena 0.14.0
-MIT or ASL 2.0: rust-fixedbitset 0.3.2
-MIT or ASL 2.0: rust-getrandom 0.2.5
-MIT or ASL 2.0: rust-glob 0.3.0
-MIT or ASL 2.0: rust-idna 0.2.3
-MIT or ASL 2.0: rust-itertools 0.10.3
-MIT or ASL 2.0: rust-lazy_static 1.4.0
-MIT or ASL 2.0: rust-lazycell 1.3.0
-MIT or ASL 2.0: rust-libc 0.2.119
-MIT or ASL 2.0: rust-log 0.4.14
-MIT or ASL 2.0: rust-minimal-lexical 0.2.1
-MIT or ASL 2.0: rust-num-integer 0.1.44
-MIT or ASL 2.0: rust-num-traits 0.2.14
-MIT or ASL 2.0: rust-petgraph 0.5.1
-MIT or ASL 2.0: rust-pkg-config 0.3.24
-MIT or ASL 2.0: rust-proc-macro2 1.0.36
-MIT or ASL 2.0: rust-quote 1.0.15
-MIT or ASL 2.0: rust-regex 1.5.5
-MIT or ASL 2.0: rust-regex-syntax 0.6.25
-MIT or ASL 2.0: rust-rustc-demangle 0.1.21
-MIT or ASL 2.0: rust-scopeguard 1.1.0
-MIT or ASL 2.0: rust-shlex 1.1.0
-MIT or ASL 2.0: rust-siphasher 0.3.10
-MIT or ASL 2.0: rust-smallvec 1.8.0
-MIT or ASL 2.0: rust-string_cache 0.8.3
-MIT or ASL 2.0: rust-syn 1.0.86
-MIT or ASL 2.0: rust-term 0.7.0
-MIT or ASL 2.0: rust-term_size 0.3.2
-MIT or ASL 2.0: rust-thiserror 1.0.30
-MIT or ASL 2.0: rust-thiserror-impl 1.0.30
-MIT or ASL 2.0: rust-time0.1 0.1.44
-MIT or ASL 2.0: rust-typenum 1.15.0
-MIT or ASL 2.0: rust-unicode-bidi 0.3.7
-MIT or ASL 2.0: rust-unicode-normalization 0.1.19
-MIT or ASL 2.0: rust-unicode-width 0.1.9
-MIT or ASL 2.0: rust-unicode-xid 0.2.2
-MIT or ASL 2.0: rust-vec_map 0.8.2
-MIT or ASL 2.0: rust-version_check 0.9.4
-MIT or zlib or ASL 2.0: rust-miniz_oxide 0.4.4
-MIT: rust-ansi_term 0.12.1
-MIT: rust-atty 0.2.14
-MIT: rust-clap2 2.34.0
-MIT: rust-crunchy 0.2.2
-MIT: rust-generic-array 0.14.5
-MIT: rust-matches 0.1.9
-MIT: rust-memsec 0.6.0
-MIT: rust-new_debug_unreachable 1.0.4
-MIT: rust-nom 7.1.0
-MIT: rust-phf_shared 0.10.0
-MIT: rust-pico-args 0.4.2
-MIT: rust-precomputed-hash 0.1.1
-MIT: rust-sha1collisiondetection 0.2.5
-MIT: rust-strsim 0.10.0
-MIT: rust-textwrap0.11 0.11.0
-Unlicense or MIT: rust-aho-corasick 0.7.18
-Unlicense or MIT: rust-memchr 2.4.1
-zlib or ASL 2.0 or MIT: rust-tinyvec 1.5.1
diff --git a/rust-sequoia-sqv.spec b/rust-sequoia-sqv.spec
index 55603fc..cb3f741 100644
--- a/rust-sequoia-sqv.spec
+++ b/rust-sequoia-sqv.spec
@@ -1,48 +1,41 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
%bcond_without check
%global crate sequoia-sqv
-Name: rust-%{crate}
+Name: rust-sequoia-sqv
Version: 1.1.0
Release: %autorelease
Summary: Simple OpenPGP signature verification program
-# Upstream license specification: GPL-2.0-or-later
-License: GPLv2+
+License: GPL-2.0-or-later
URL:
https://crates.io/crates/sequoia-sqv
-Source0: %{crates_source}
-Source1: LICENSE.dependencies
-# Initial patched metadata
+Source: %{crates_source}
+# Manually created patch for downstream crate metadata changes
# * exclude files that are only useful for upstream development
-Patch0: sequoia-sqv-fix-metadata.diff
+Patch: sequoia-sqv-fix-metadata.diff
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: rust-packaging >= 23
%global _description %{expand:
-Simple OpenPGP signature verification program.}
+A simple OpenPGP signature verification program.}
%description %{_description}
%package -n %{crate}
Summary: %{summary}
-# 0BSD or MIT or ASL 2.0
-# ASL 2.0
-# ASL 2.0 or MIT
-# BSD
-# CC0
-# GPLv2+
-# LGPLv2+
-# LGPLv3 or GPLv2 or GPLv3
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# Apache-2.0 OR MIT
+# BSL-1.0
+# GPL-2.0-or-later
+# LGPL-2.0-or-later
+# LGPL-3.0 OR GPL-2.0 OR GPL-3.0
# MIT
-# MIT or ASL 2.0
-# MIT or ASL 2.0 or zlib
-# MIT or zlib or ASL 2.0
-# Unlicense or MIT
-# zlib or ASL 2.0 or MIT
-License: GPLv2+ and ASL 2.0 and BSD and CC0 and MIT
+# MIT OR Apache-2.0
+# MIT OR Apache-2.0 OR Zlib
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+License: BSL-1.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT AND
Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR
Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
%description -n %{crate} %{_description}
@@ -55,7 +48,6 @@ License: GPLv2+ and ASL 2.0 and BSD and CC0 and MIT
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
-cp %{SOURCE1} .
# remove integration tests (assert-cli is broken during RPM builds)
rm -r tests
%cargo_prep
@@ -65,6 +57,8 @@ rm -r tests
%build
%cargo_build
+%{cargo_license_summary}
+%{cargo_license} > LICENSE.dependencies
%install
%cargo_install
diff --git a/sequoia-sqv-fix-metadata.diff b/sequoia-sqv-fix-metadata.diff
index 07c1b88..98439fd 100644
--- a/sequoia-sqv-fix-metadata.diff
+++ b/sequoia-sqv-fix-metadata.diff
@@ -1,5 +1,5 @@
--- sequoia-sqv-1.1.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ sequoia-sqv-1.1.0/Cargo.toml 2022-03-16T11:04:29.088083+00:00
++++ sequoia-sqv-1.1.0/Cargo.toml 2023-08-07T14:20:13.647143+00:00
@@ -14,7 +14,7 @@
name = "sequoia-sqv"
version = "1.1.0"
commit 06ad65cdb4ff357980e12d49f2b98e66ddb5c794
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 21 23:25:23 2023 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>