From 54cdde1a2d1cf22518185c8d81dae92c46f106ba Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Tue, 25 Mar 2025 16:01:00 +0100
Subject: [PATCH] Update to 1.3.0

Resolves: RHEL-84164
---
 .gitignore                    |  2 ++
 rust-sequoia-sqv.spec         | 29 +++++++++++++++++++++--------
 sequoia-sqv-fix-metadata.diff | 12 ++++++------
 sources                       |  4 ++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index af35857..4df3b06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /rust-sequoia-sqv-1.2.1-vendor.tar.xz
 /sequoia-sqv-1.2.1.crate
+/rust-sequoia-sqv-1.3.0-vendor.tar.xz
+/sequoia-sqv-1.3.0.crate
diff --git a/rust-sequoia-sqv.spec b/rust-sequoia-sqv.spec
index 22e8d76..d8da1de 100644
--- a/rust-sequoia-sqv.spec
+++ b/rust-sequoia-sqv.spec
@@ -1,5 +1,5 @@
-# Generated by rust2rpm 26
-%bcond_without check
+# Generated by rust2rpm 27
+%bcond check 1
 
 %global crate sequoia-sqv
 
@@ -13,13 +13,13 @@
 %endif
 
 Name:           rust-sequoia-sqv
-Version:        1.2.1
+Version:        1.3.0
 Release:        %autorelease
 Summary:        Simple OpenPGP signature verification program
 
-License:        GPL-2.0-or-later
+License:        LGPL-2.0-or-later
 URL:            https://crates.io/crates/sequoia-sqv
-Source0:        %{crates_source}
+Source:         %{crates_source}
 
 # Generated using cargo-vendor-filterer:
 #   cargo download %%{crate}==%%{version} > %%{crate}-%%{version}.crate
@@ -30,7 +30,9 @@ 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
+#   popd
 Source1:        %{name}-%{version}-vendor.tar.xz
 # Manually created patch for downstream crate metadata changes
 # * switch crypto backend from Nettle to OpenSSL
@@ -59,15 +61,26 @@ Summary:        %{summary}
 # Apache-2.0
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-3-Clause
 # BSL-1.0
-# GPL-2.0-or-later
 # LGPL-2.0-or-later
 # MIT
 # MIT OR Apache-2.0
 # MIT OR Apache-2.0 OR Zlib
 # Unlicense OR MIT
 # Zlib OR Apache-2.0 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:        %{shrink:
+    LGPL-2.0-or-later AND
+    Apache-2.0 AND
+    BSD-3-Clause AND
+    BSL-1.0 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}
diff --git a/sequoia-sqv-fix-metadata.diff b/sequoia-sqv-fix-metadata.diff
index d0eb612..367b43c 100644
--- a/sequoia-sqv-fix-metadata.diff
+++ b/sequoia-sqv-fix-metadata.diff
@@ -1,7 +1,7 @@
---- 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"
+--- sequoia-sqv-1.3.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-sqv-1.3.0/Cargo.toml	2025-03-08T11:15:16.145149+00:00
+@@ -54,13 +54,9 @@
+ status = "actively-developed"
  
  [features]
 -crypto-botan = ["sequoia-openpgp/crypto-botan"]
@@ -13,5 +13,5 @@
 -default = ["crypto-nettle"]
 +default = ["crypto-openssl"]
  
- [badges.gitlab]
- repository = "sequoia-pgp/sequoia"
+ [[bin]]
+ name = "sqv"
diff --git a/sources b/sources
index e96fb2f..7a3fd62 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rust-sequoia-sqv-1.2.1-vendor.tar.xz) = 2a607f30a146a9948dd1e94921f331e9c2448728e048a4c19c49c70e774309eb960ae41c54562bef1725a1038751a7e5ef5177c091c781783bea2a8f973f9721
-SHA512 (sequoia-sqv-1.2.1.crate) = 9e784b64b8c2b84b6e89abfecd49083b8cc37809a4879ec0fa4201e79b31cbf06562c07773b0b6ebc31990034c70172f2dc59ba4b0c3af1e8bdc23e9dec29cd8
+SHA512 (rust-sequoia-sqv-1.3.0-vendor.tar.xz) = 7effd7935f8f875b4f6fa44c974867928bf19199e16066726638599b3d30a340a933b8cad9c5db2f0d3d1ebec31d8d098764a2caa7c968afa98e56a634a35cea
+SHA512 (sequoia-sqv-1.3.0.crate) = fd06ac5373501132187e4ec85236b647b2655c39b0b6fe9e6c1360defbeb52f7ccdb5c2beffc8265542d086236e99d6456fec0a74eb2d888cb8a0e40e79fd01f