From 484f06ad7f78cc53cd0011e87c2f52bd677f5056 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 14 Apr 2023 11:27:41 +0200
Subject: [PATCH] Update to version 0.25.0; Fixes RHBZ#2160048

---
 .gitignore                               |  1 +
 .rust2rpm.conf                           |  3 --
 rust-sequoia-autocrypt.spec              | 65 +++---------------------
 sequoia-autocrypt-fix-metadata-auto.diff | 17 +++++++
 sources                                  |  2 +-
 5 files changed, 27 insertions(+), 61 deletions(-)
 delete mode 100644 .rust2rpm.conf
 create mode 100644 sequoia-autocrypt-fix-metadata-auto.diff

diff --git a/.gitignore b/.gitignore
index a403cc9..93bcc84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 
 /sequoia-autocrypt-0.23.1.crate
 /sequoia-autocrypt-0.24.0.crate
+/sequoia-autocrypt-0.25.0.crate
diff --git a/.rust2rpm.conf b/.rust2rpm.conf
deleted file mode 100644
index 3bcb373..0000000
--- a/.rust2rpm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  crypto-cng
diff --git a/rust-sequoia-autocrypt.spec b/rust-sequoia-autocrypt.spec
index 8992f8f..50f970f 100644
--- a/rust-sequoia-autocrypt.spec
+++ b/rust-sequoia-autocrypt.spec
@@ -1,20 +1,19 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate sequoia-autocrypt
 
-Name:           rust-%{crate}
-Version:        0.24.0
+Name:           rust-sequoia-autocrypt
+Version:        0.25.0
 Release:        %autorelease
 Summary:        Autocrypt support
 
-# Upstream license specification: LGPL-2.0-or-later
-License:        LGPLv2+
+License:        LGPL-2.0-or-later
 URL:            https://crates.io/crates/sequoia-autocrypt
 Source:         %{crates_source}
-
-ExclusiveArch:  %{rust_arches}
+# Automatically generated patch to strip foreign dependencies
+Patch:          sequoia-autocrypt-fix-metadata-auto.diff
 
 BuildRequires:  rust-packaging >= 21
 
@@ -49,54 +48,6 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+compression-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compression-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compression" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compression-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+compression-bzip2-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compression-bzip2-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compression-bzip2" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compression-bzip2-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+compression-deflate-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compression-deflate-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compression-deflate" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compression-deflate-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+crypto-nettle-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+crypto-nettle-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "crypto-nettle" feature of the "%{crate}" crate.
-
-%files       -n %{name}+crypto-nettle-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
@@ -105,14 +56,14 @@ use the "crypto-nettle" feature of the "%{crate}" crate.
 %cargo_generate_buildrequires
 
 %build
-%cargo_build
+%cargo_build -f sequoia-openpgp/crypto-nettle
 
 %install
 %cargo_install
 
 %if %{with check}
 %check
-%cargo_test
+%cargo_test -f sequoia-openpgp/crypto-nettle
 %endif
 
 %changelog
diff --git a/sequoia-autocrypt-fix-metadata-auto.diff b/sequoia-autocrypt-fix-metadata-auto.diff
new file mode 100644
index 0000000..e72a1c0
--- /dev/null
+++ b/sequoia-autocrypt-fix-metadata-auto.diff
@@ -0,0 +1,17 @@
+--- sequoia-autocrypt-0.25.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-autocrypt-0.25.0/Cargo.toml	2023-04-14T09:20:11.211791+00:00
+@@ -60,14 +60,6 @@
+ ]
+ default-features = false
+ 
+-[target."cfg(windows)".dev-dependencies.sequoia-openpgp]
+-version = "1"
+-features = [
+-    "crypto-cng",
+-    "__implicit-crypto-backend-for-tests",
+-]
+-default-features = false
+-
+ [badges.gitlab]
+ repository = "sequoia-pgp/sequoia"
+ 
diff --git a/sources b/sources
index 2c15f26..4142c1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-autocrypt-0.24.0.crate) = 1ac2844c78235f0fd70779d078fa36f9b5ac8540c0de1e6835fc3f8f8ffc2bce45b05b9a1f46dcc617446c3d49786f68cbfedb18744eac5bb574f3beaeada8ed
+SHA512 (sequoia-autocrypt-0.25.0.crate) = e964b5346860b532853e711ff708ea6717cd3c5839b1bc95775e182d2d6872290a2f5ad5b92173de328e7b175e1f0a35c2a20d8634f845b5d3ea8a0c47816490