Update to version 0.33.0; Fixes RHBZ#2259207

.gitignore

@@ -4,3 +4,4 @@
 /sequoia-sq-0.25.0.crate
 /sequoia-sq-0.26.0.crate
 /sequoia-sq-0.32.0.crate
+/sequoia-sq-0.33.0.crate

0001-fix-building-shell-completions-and-man-pages.patch

@@ -1,37 +0,0 @@
-From af8d0e678603bc922ba2249d05872f08a596136d Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Tue, 19 Dec 2023 18:56:57 +0100
-Subject: [PATCH] fix building shell completions and man pages
-
----
- build.rs | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/build.rs b/build.rs
-index 1a844ad..be4e686 100644
---- a/build.rs
-+++ b/build.rs
-@@ -25,16 +25,14 @@ fn main() {
-     dump_help(sq.clone()).unwrap();
- 
-     // Generate shell completions
--    let outdir = match env::var_os("CARGO_TARGET_DIR") {
--        None => return,
--        Some(outdir) => outdir,
--    };
-+    let out_dir = std::path::PathBuf::from(
-+        std::env::var_os("OUT_DIR").ok_or(std::io::ErrorKind::NotFound).unwrap());
- 
--    fs::create_dir_all(&outdir).unwrap();
-+    fs::create_dir_all(&out_dir).unwrap();
- 
-     for shell in &[Shell::Bash, Shell::Fish, Shell::Zsh, Shell::PowerShell,
-                    Shell::Elvish] {
--        let path = clap_complete::generate_to(*shell, &mut sq, "sq", &outdir).unwrap();
-+        let path = clap_complete::generate_to(*shell, &mut sq, "sq", &out_dir).unwrap();
-         println!("cargo:warning=completion file is generated: {:?}", path);
-     };
- 
--- 
-2.43.0
-

rust-sequoia-sq.spec

@@ -4,7 +4,7 @@
 %global crate sequoia-sq
 
 Name:           rust-sequoia-sq
-Version:        0.32.0
+Version:        0.33.0
 Release:        %autorelease
 Summary:        Command-line frontends for Sequoia
 
@@ -13,12 +13,9 @@ URL:            https://crates.io/crates/sequoia-sq
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * exclude files that are only useful for upstream development
-# * prevent manpages from getting installed twice
 # * drop automated generation of upstream integration tests
 # * drop features for unsupported crypto backends
 Patch:          sequoia-sq-fix-metadata.diff
-# https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/163
-Patch:          0001-fix-building-shell-completions-and-man-pages.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -57,6 +54,7 @@ License:        LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND BSD-3-Clause AN
 %license LICENSE.txt
 %license LICENSE.dependencies
 %doc README.md
+%doc NEWS
 %{_bindir}/sq
 %{_mandir}/man1/sq*
 %{bash_completions_dir}/sq.bash
@@ -82,13 +80,13 @@ rm -vr tests/
 %cargo_install
 # install manual pages
 mkdir -p %{buildroot}/%{_mandir}/man1
-cp -pav target/release/build/%{crate}-*/out/sq*.1 %{buildroot}/%{_mandir}/man1/
+cp -pav target/release/build/%{crate}-*/out/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/
 # install shell completions
-install -Dpm 0644 target/release/build/%{crate}-*/out/sq.bash \
+install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.bash \
     %{buildroot}/%{bash_completions_dir}/sq.bash
-install -Dpm 0644 target/release/build/%{crate}-*/out/sq.fish \
+install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.fish \
     %{buildroot}/%{fish_completions_dir}/sq.fish
-install -Dpm 0644 target/release/build/%{crate}-*/out/_sq \
+install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sq \
     %{buildroot}/%{zsh_completions_dir}/_sq
 
 %if %{with check}

sequoia-sq-fix-metadata.diff

@@ -1,5 +1,5 @@
---- sequoia-sq-0.32.0/Cargo.toml	1970-01-01T00:00:01+00:00
+--- sequoia-sq-0.33.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-sq-0.32.0/Cargo.toml	2023-12-19T16:57:04.024891+00:00
++++ sequoia-sq-0.33.0/Cargo.toml	2024-01-19T17:24:47.996766+00:00
 @@ -44,6 +44,12 @@
  ]
  license = "LGPL-2.0-or-later"
@@ -12,7 +12,7 @@
 +]
  
  [profile.release]
- debug = true
+ debug = 2
 @@ -76,10 +82,6 @@
  [dependencies.dirs]
  version = "5"
@@ -24,13 +24,16 @@
  [dependencies.humantime]
  version = "2"
  
-@@ -143,14 +145,8 @@
+@@ -136,17 +138,11 @@
  [dev-dependencies.assert_cmd]
  version = "2"
  
 -[dev-dependencies.fehler]
 -version = "1.0.0"
 -
+ [dev-dependencies.libc]
+ version = "0.2"
+ 
  [dev-dependencies.predicates]
  version = ">=2, <4"
 -
@@ -39,9 +42,9 @@
  
  [build-dependencies.anyhow]
  version = "1.0.18"
-@@ -189,29 +185,19 @@
+@@ -189,27 +185,17 @@
- version = "1.17"
+ version = "1.0.137"
- default-features = false
+ features = ["derive"]
  
 -[build-dependencies.subplot-build]
 -version = ">=0.7, <0.10"
@@ -51,7 +54,6 @@
  version = ">=0.2.6, <0.4"
  
  [features]
- autocrypt = ["sequoia-autocrypt"]
  compression-bzip2 = ["sequoia-openpgp/compression-bzip2"]
 -crypto-botan = ["sequoia-openpgp/crypto-botan"]
 -crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
@@ -62,7 +64,6 @@
  default = [
      "crypto-nettle",
      "compression-bzip2",
-     "autocrypt",
 -    "dot-writer",
 -]
 -subplot = ["subplot-build"]

sources

@@ -1 +1 @@
-SHA512 (sequoia-sq-0.32.0.crate) = 33688d286d830391b55a3d309d22d0561335941aaef1fe3e9878158ed28c53b2b1a90e0c168be9457f8b9e3d22a1f771ad67f322767e959d4ad959a01479a3c0
+SHA512 (sequoia-sq-0.33.0.crate) = c366c7c2f2fcc398194f20922fed72bf18ede12164f8d0438bac0ca08f0900004f3c1039f8cd3ee480ded3e42104cf6ac4365020b9f258dc115594112ec3b101