From c9f9f7044e006d6e9f6432dd018ebfa1c63b65e3 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 26 Jan 2024 16:20:27 +0100
Subject: [PATCH] Update to version 1.6.0; Fixes RHBZ#2260336

---
 .gitignore                    |  2 ++
 rpm-sequoia-fix-metadata.diff |  4 ++--
 rust-rpm-sequoia.spec         | 10 +++++-----
 sources                       |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index bfdb068..bc05021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /rpm-sequoia-1.4.1-vendor.tar.xz
 /rpm-sequoia-1.5.0.crate
 /rpm-sequoia-1.5.0-vendor.tar.xz
+/rpm-sequoia-1.6.0.crate
+/rpm-sequoia-1.6.0-vendor.tar.xz
diff --git a/rpm-sequoia-fix-metadata.diff b/rpm-sequoia-fix-metadata.diff
index d5ce6c7..bcfd32f 100644
--- a/rpm-sequoia-fix-metadata.diff
+++ b/rpm-sequoia-fix-metadata.diff
@@ -1,5 +1,5 @@
---- rpm-sequoia-1.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ rpm-sequoia-1.5.0/Cargo.toml	2023-08-29T20:50:48.982586+00:00
+--- rpm-sequoia-1.6.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ rpm-sequoia-1.6.0/Cargo.toml	2024-01-25T14:12:35.470987+00:00
 @@ -73,13 +73,9 @@
  version = "0.1.4"
  
diff --git a/rust-rpm-sequoia.spec b/rust-rpm-sequoia.spec
index 42e24d2..2c91761 100644
--- a/rust-rpm-sequoia.spec
+++ b/rust-rpm-sequoia.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 
 # RHEL does not have packages for Rust dependencies
@@ -11,7 +11,7 @@
 %global crate rpm-sequoia
 
 Name:           rust-rpm-sequoia
-Version:        1.5.0
+Version:        1.6.0
 Release:        %autorelease
 Summary:        Implementation of the RPM PGP interface using Sequoia
 
@@ -21,7 +21,7 @@ Source:         %{crates_source}
 # To create the vendor tarball:
 #   tar xf %%{crate}-%%{version}.crate ; pushd %%{crate}-%%{version} ; \
 #   patch -p1 < ../rpm-sequoia-fix-metadata.diff ; \
-#   cargo vendor && tar Jcvf ../%%{crate}-%%{version}-vendor.tar.xz vendor/ ; popd
+#   cargo vendor --versioned-dirs && tar Jcvf ../%%{crate}-%%{version}-vendor.tar.xz vendor/ ; popd
 Source1:        %{crate}-%{version}-vendor.tar.xz
 # Manually created patch for downstream crate metadata changes
 # * default to the OpenSSL crypto backend of sequoia-openpgp
@@ -32,7 +32,7 @@ BuildRequires:  rust-toolset
 # vendored openssl-sys
 BuildRequires:  openssl-devel
 %else
-BuildRequires:  rust-packaging >= 23
+BuildRequires:  cargo-rpm-macros >= 24
 %endif
 
 %global _description %{expand:
@@ -74,7 +74,7 @@ Requires:       %{crate}%{?_isa} = %{version}-%{release}
 %{_libdir}/pkgconfig/rpm-sequoia.pc
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %if 0%{?bundled_rust_deps}
 %cargo_prep -V 1
 %else
diff --git a/sources b/sources
index aa2dde9..3bb082f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rpm-sequoia-1.5.0.crate) = a666c858aab35e2220d8409cbb7073eed5674a3f60a2aa4bbbc4e62cf06d1b8069244272c4e55388789784b7443fb2882a88d6b2ec18fe30ea9c74547a840edc
-SHA512 (rpm-sequoia-1.5.0-vendor.tar.xz) = 726cfe3f1fbfa7a6f2011f9b373d7fd57157ea9154155792664101d31a488864b1037fc4772902512bc68b083dfb45bc19d0a828038cb6d173b1bb34683d5151
+SHA512 (rpm-sequoia-1.6.0.crate) = d1e989d6ffc31acf4538c99365d4e3b52ff3d756ddcb9cbb5aa6a3ed9d5785930d928e3a081f6d5dfcc830b15ef21bb73a441b3fe232b1548522aa696f85ba51
+SHA512 (rpm-sequoia-1.6.0-vendor.tar.xz) = 63674d7b796c7b3d9a38dfb0f0485b98b9a71d12f9f9888b3b389f4d2452779ba511dae204c7021ad1d3d3beab4f809a45f4d25a0c492886558601ed84b9a4d2