From 634dccc5caa4164e16360148865801319ff3d947 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 6 Mar 2023 21:27:30 +0100
Subject: [PATCH] Update to version 0.6.0; Fixes RHBZ#2175814

---
 .gitignore                                   |  1 +
 rust-sequoia-policy-config.spec              | 12 +++++++-----
 sequoia-policy-config-fix-metadata-auto.diff |  6 +++---
 sequoia-policy-config-fix-metadata.diff      | 17 +++++++++++++----
 sources                                      |  2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0547373..853075c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sequoia-policy-config-0.3.0.crate
 /sequoia-policy-config-0.4.0.crate
 /sequoia-policy-config-0.5.0.crate
+/sequoia-policy-config-0.6.0.crate
diff --git a/rust-sequoia-policy-config.spec b/rust-sequoia-policy-config.spec
index 2e91ef9..394f39f 100644
--- a/rust-sequoia-policy-config.spec
+++ b/rust-sequoia-policy-config.spec
@@ -1,10 +1,10 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 24
 %bcond_without check
 
 %global crate sequoia-policy-config
 
 Name:           rust-sequoia-policy-config
-Version:        0.5.0
+Version:        0.6.0
 Release:        %autorelease
 Summary:        Configure Sequoia using a configuration file
 
@@ -14,7 +14,7 @@ Source:         %{crates_source}
 # Automatically generated patch to strip foreign dependencies
 Patch:          sequoia-policy-config-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
-# * default to the nettle crypto backend of sequoia-openpgp
+# * default to the OpenSSL crypto backend of sequoia-openpgp
 Patch:          sequoia-policy-config-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 23
@@ -26,16 +26,17 @@ Configure Sequoia using a configuration file.}
 
 %package     -n %{crate}
 Summary:        %{summary}
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# Apache-2.0
 # Apache-2.0 OR MIT
 # BSL-1.0
 # LGPL-2.0-or-later
-# LGPL-3.0 OR GPL-2.0 OR GPL-3.0
 # MIT
 # MIT OR Apache-2.0
 # MIT OR Apache-2.0 OR Zlib
 # Unlicense OR MIT
 # Zlib OR Apache-2.0 OR MIT
-License:        LGPL-3.0 AND BSL-1.0 AND MIT
+License:        LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode-DFS-2016
 # LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
@@ -81,6 +82,7 @@ use the "default" feature of the "%{crate}" crate.
 
 %build
 %cargo_build
+%cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
 
 %install
diff --git a/sequoia-policy-config-fix-metadata-auto.diff b/sequoia-policy-config-fix-metadata-auto.diff
index 43ccb03..946486d 100644
--- a/sequoia-policy-config-fix-metadata-auto.diff
+++ b/sequoia-policy-config-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- sequoia-policy-config-0.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-policy-config-0.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
-@@ -68,10 +68,5 @@
+--- sequoia-policy-config-0.6.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-policy-config-0.6.0/Cargo.toml	2023-03-06T18:28:15.678853+00:00
+@@ -67,10 +67,5 @@
  features = ["crypto-nettle"]
  default-features = false
  
diff --git a/sequoia-policy-config-fix-metadata.diff b/sequoia-policy-config-fix-metadata.diff
index fc75493..3211b88 100644
--- a/sequoia-policy-config-fix-metadata.diff
+++ b/sequoia-policy-config-fix-metadata.diff
@@ -1,10 +1,19 @@
---- sequoia-policy-config-0.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-policy-config-0.5.0/Cargo.toml	2022-11-23T16:27:17.113686+00:00
-@@ -46,6 +46,7 @@
+--- sequoia-policy-config-0.6.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-policy-config-0.6.0/Cargo.toml	2023-03-06T18:28:37.885896+00:00
+@@ -45,6 +45,7 @@
  
  [dependencies.sequoia-openpgp]
  version = "1.11"
-+features = ["crypto-nettle"]
++features = ["crypto-openssl"]
  default-features = false
  
  [dependencies.serde]
+@@ -64,7 +65,7 @@
+ 
+ [target."cfg(not(windows))".dev-dependencies.sequoia-openpgp]
+ version = "1.11"
+-features = ["crypto-nettle"]
++features = ["crypto-openssl"]
+ default-features = false
+ 
+ [badges.maintenance]
diff --git a/sources b/sources
index b39b137..d4fc003 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-policy-config-0.5.0.crate) = 93b1b6f1f84b2abd74089819d972a9c5ad3d30e2a43eeeb0634d92934802c6ab03eb0ef51487ef3d13894b2863b78c1cc72dcafa51f57a03ddbff8ca5fa0167b
+SHA512 (sequoia-policy-config-0.6.0.crate) = 499d350426f80627278310b2eded6a69a7ad833058129ea5ed9ebd0255621ff70f9f04228fc8ca79830e6ec11d14b121bb3e5a6c5fc2721135d725bdf0d886ee