Make installation of shell completions and man pages more robust

Without this, OpenScanHub fails to run the install step as it injects
clippy build into the process, which creates different configuration and
therefore different build directory.

Taken from Fedora change

1bcf609430

Related: RHEL-84033

.gitignore

@@ -1,3 +1,7 @@
 /sequoia-sq-0.37.0.crate
 /rust-sequoia-sq-0.37.0-vendor.tar.xz
 /capnproto-c++-1.0.1.tar.gz
+/sequoia-sq-1.1.0.crate
+/rust-sequoia-sq-1.1.0-vendor.tar.xz
+/sequoia-sq-1.3.0.crate
+/rust-sequoia-sq-1.3.0-vendor.tar.xz

rust-sequoia-sq.spec

@@ -1,5 +1,5 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 27
-%bcond_without check
+%bcond check 1
 
 %global crate sequoia-sq
 
@@ -15,7 +15,7 @@
 %endif
 
 Name:           rust-sequoia-sq
-Version:        0.37.0
+Version:        1.3.0
 Release:        %autorelease
 Summary:        Command-line frontends for Sequoia
 
@@ -33,7 +33,8 @@ Source0:        %{crates_source}
 #                         --platform aarch64-unknown-linux-gnu \
 #                         --platform i686-unknown-linux-gnu \
 #                         --platform s390x-unknown-linux-gnu \
-#                         --all-features=true
+#                         --all-features
+#   tar -cJf ../rust-%%{crate}-%%{version}-vendor.tar.xz vendor
 Source1:        %{name}-%{version}-vendor.tar.xz
 Source2:        capnproto-c++-1.0.1.tar.gz
 # Manually created patch for downstream crate metadata changes
@@ -75,6 +76,7 @@ Summary:        %{summary}
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
 # BSD-2-Clause OR Apache-2.0 OR MIT
+# BSD-3-Clause
 # BSL-1.0
 # LGPL-2.0-or-later
 # MIT
@@ -84,7 +86,22 @@ Summary:        %{summary}
 # MPL-2.0
 # Unlicense OR MIT
 # Zlib OR Apache-2.0 OR MIT
-License:        LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
+License:        %{shrink:
+    LGPL-2.0-or-later AND
+    Apache-2.0 AND
+    BSL-1.0 AND
+    BSD-3-Clause AND
+    MIT AND
+    MPL-2.0 AND
+    Unicode-DFS-2016 AND
+    (0BSD OR MIT OR Apache-2.0) AND
+    (Apache-2.0 OR BSL-1.0) AND
+    (Apache-2.0 OR ISC OR MIT) 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}
@@ -107,12 +124,14 @@ License:        LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND BSD-3-Clause AN
 
 # drop broken integration tests
 rm -vr subplot/
+rm -v tests/sq-subplot.rs
 # don't lock the dependencies
 rm -f Cargo.lock
 %else
 %cargo_prep
 # drop broken integration tests
 rm -vr subplot/
+rm -v tests/sq-subplot.rs
 
 %generate_buildrequires
 %cargo_generate_buildrequires
@@ -126,6 +145,7 @@ popd
 %endif
 
 %build
+export ASSET_OUT_DIR=target/assets
 %if %{with bundled_capnproto}
 pushd bundled_capnproto
 %cmake -DBUILD_TESTING=OFF
@@ -141,20 +161,18 @@ popd
 %cargo_install
 # install manual pages
 mkdir -p %{buildroot}/%{_mandir}/man1
-cp -pav target/release/build/%{crate}-*/out/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/
+cp -pav target/assets/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/
 # install shell completions
-install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.bash \
+install -Dpm 0644 target/assets/shell-completions/sq.bash \
     %{buildroot}/%{bash_completions_dir}/sq.bash
-install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.fish \
+install -Dpm 0644 target/assets/shell-completions/sq.fish \
     %{buildroot}/%{fish_completions_dir}/sq.fish
-install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sq \
+install -Dpm 0644 target/assets/shell-completions/_sq \
     %{buildroot}/%{zsh_completions_dir}/_sq
 
 %if %{with check}
 %check
-# * skip tests that require files which are not included in published crates
+%cargo_test
-# * skip tests that fail because the Fedora crypto policy is too strict
-%cargo_test -- -- --exact --skip cli::cert::export::sq_cert_export --skip cli::cert::import::sq_cert_import --skip cli::inspect::sq_inspect --skip cli::key::expire::sq_key_expire --skip cli::key::sq_key_import --skip cli::key::sq_key_list --skip cli::pki::sq_pki_authenticate --skip cli::pki::sq_pki_identify --skip cli::pki::sq_pki_list --skip cli::pki::sq_pki_lookup --skip cli::pki::sq_pki_path --skip sq_sign --skip sq_sign_append --skip sq_sign_append_on_compress_then_sign --skip sq_sign_detached --skip sq_sign_detached_append --skip sq_sign_with_notations --skip sq_autocrypt_import
 %endif
 
 %changelog

rust2rpm.toml

@@ -11,50 +11,29 @@ extra-files = [
     "%{fish_completions_dir}/sq.fish",
     "%{zsh_completions_dir}/_sq",
 ]
+doc-files.exclude = [
+    "sq-subplot.md",
+]
 
 [scripts]
 prep.post = [
     "# drop broken integration tests",
     "rm -vr subplot/",
+    "rm -v tests/sq-subplot.rs",
+]
+build.pre = [
+    "export ASSET_OUT_DIR=target/assets",
 ]
 install.post = [
     "# install manual pages",
     "mkdir -p %{buildroot}/%{_mandir}/man1",
-    "cp -pav target/release/build/%{crate}-*/out/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/",
+    "cp -pav target/assets/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/",
     "# install shell completions",
-    "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.bash \\",
+    "install -Dpm 0644 target/assets/shell-completions/sq.bash \\",
     "    %{buildroot}/%{bash_completions_dir}/sq.bash",
-    "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.fish \\",
+    "install -Dpm 0644 target/assets/shell-completions/sq.fish \\",
     "    %{buildroot}/%{fish_completions_dir}/sq.fish",
-    "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sq \\",
+    "install -Dpm 0644 target/assets/shell-completions/_sq \\",
     "    %{buildroot}/%{zsh_completions_dir}/_sq",
 ]
 
-[tests]
-skip = [
-    # --lib
-    "cli::cert::export::sq_cert_export",
-    "cli::cert::import::sq_cert_import",
-    "cli::inspect::sq_inspect",
-    "cli::key::expire::sq_key_expire",
-    "cli::key::sq_key_import",
-    "cli::key::sq_key_list",
-    "cli::pki::sq_pki_authenticate",
-    "cli::pki::sq_pki_identify",
-    "cli::pki::sq_pki_list",
-    "cli::pki::sq_pki_lookup",
-    "cli::pki::sq_pki_path",
-    # --test sq-sign
-    "sq_sign",
-    "sq_sign_append",
-    "sq_sign_append_on_compress_then_sign",
-    "sq_sign_detached",
-    "sq_sign_detached_append",
-    "sq_sign_with_notations",
-]
-skip-exact = true
-comments = [
-    "skip tests that require files which are not included in published crates",
-    "skip tests that fail because the Fedora crypto policy is too strict",
-]
-

sequoia-sq-fix-metadata.diff

@@ -1,6 +1,6 @@
---- sequoia-sq-0.37.0/Cargo.toml	1970-01-01T00:00:01+00:00
+--- sequoia-sq-1.3.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-sq-0.37.0/Cargo.toml	2024-06-15T16:34:04.061673+00:00
++++ sequoia-sq-1.3.0/Cargo.toml	2025-03-08T12:37:34.404402+00:00
-@@ -44,6 +44,12 @@
+@@ -49,6 +49,12 @@
  ]
  license = "LGPL-2.0-or-later"
  repository = "https://gitlab.com/sequoia-pgp/sequoia-sq"
@@ -11,52 +11,10 @@
 +    "/sq-subplot.md",
 +]
  
- [profile.release]
+ [badges.gitlab]
- debug = true
+ repository = "sequoia-pgp/sequoia-sq"
-@@ -76,10 +82,6 @@
+@@ -57,18 +63,10 @@
- [dependencies.dirs]
+ status = "actively-developed"
- version = "5"
- 
--[dependencies.dot-writer]
--version = "0.1.3"
--optional = true
--
- [dependencies.humantime]
- version = "2"
- 
-@@ -155,9 +157,6 @@
- [dev-dependencies.dircpy]
- version = "0.3"
- 
--[dev-dependencies.fehler]
--version = "1.0.0"
--
- [dev-dependencies.libc]
- version = "0.2"
- 
-@@ -166,9 +165,6 @@
- 
- [dev-dependencies.regex]
- version = "1"
--
--[dev-dependencies.subplotlib]
--version = ">=0.7, <0.10"
- 
- [build-dependencies.anyhow]
- version = "1.0.18"
-@@ -217,10 +213,6 @@
- version = "1.0.137"
- features = ["derive"]
- 
--[build-dependencies.subplot-build]
--version = ">=0.7, <0.10"
--optional = true
--
- [build-dependencies.terminal_size]
- version = ">=0.2.6, <0.4"
- 
-@@ -228,17 +220,12 @@
- version = ">=0.15, <0.17"
  
  [features]
 -crypto-botan = ["sequoia-openpgp/crypto-botan"]
@@ -65,13 +23,58 @@
  crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
  crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
  crypto-rust = ["sequoia-openpgp/crypto-rust"]
- default = [
+-default = ["crypto-nettle"]
--    "crypto-nettle",
+-subplot = [
--    "dot-writer",
+-    "culpa",
+-    "subplot-build",
+-    "subplotlib",
 -]
--subplot = ["subplot-build"]
++default = ["crypto-openssl"]
-+    "crypto-openssl",
+ 
-+]
+ [[bin]]
+ name = "sq"
+@@ -79,11 +77,6 @@
+ name = "integration"
+ path = "tests/integration.rs"
+ 
+-[[test]]
+-name = "sq-subplot"
+-path = "tests/sq-subplot.rs"
+-required-features = ["subplot"]
+-
+ [dependencies.aho-corasick]
+ version = "1"
+ 
+@@ -111,10 +104,6 @@
+ version = "0.7"
+ default-features = false
+ 
+-[dependencies.culpa]
+-version = "1"
+-optional = true
+-
+ [dependencies.dirs]
+ version = "5"
+ 
+@@ -192,10 +181,6 @@
+ [dependencies.serde]
+ version = "1.0.137"
+ features = ["derive"]
+-
+-[dependencies.subplotlib]
+-version = ">=0.11, <0.13"
+-optional = true
+ 
+ [dependencies.tempfile]
+ version = "3.1"
+@@ -298,10 +283,6 @@
+ version = "1.0.137"
+ features = ["derive"]
+ 
+-[build-dependencies.subplot-build]
+-version = ">=0.11, <0.13"
+-optional = true
+-
+ [build-dependencies.terminal_size]
+ version = ">=0.2.6, <0.5"
  
- [badges.gitlab]
- repository = "sequoia-pgp/sequoia-sq"

sources

@@ -1,3 +1,3 @@
-SHA512 (sequoia-sq-0.37.0.crate) = c716284bfd1f8492d7f073c07adbbfd73495573a8503d7aa5e24a42873a50392086c69c25a1bd655e3d09df6c369bc2568d02dfda3dc83c189cb9187c440162c
+SHA512 (sequoia-sq-1.3.0.crate) = b4e6822aa717a790278a6e4f5afe287214e5777bdfac42882629834ef6b10ae20ac37086823aa01edc69f4a5f094f429671849871e64027473cfb5f297133082
-SHA512 (rust-sequoia-sq-0.37.0-vendor.tar.xz) = 27ef8c7dfbb535ce51534b9bd66a5cea2f5fcf779dfd69b95002b0e0e30641f9bc69240d83ed8dc11e07ca79cec1dd067938e4367036d85f8367a2ec6c09e45b
+SHA512 (rust-sequoia-sq-1.3.0-vendor.tar.xz) = 2af724ef29cb9fc5faf4e0488b29285d74b3bbc23288536fc1aeeaba705beb483ab90dd941ff0b7881cf6b9da146e411f5541d675a2053eedb03386747e4d2cf
 SHA512 (capnproto-c++-1.0.1.tar.gz) = c60291f433eea15a51e480e1679a4b9b3b5e67edebc445e371a7a32fce6ec5a7e4b440b17b2adc0565519ec369e3dae8ea727ae790a082a53ecd0d245b5275a9