From 028d0c2775f1f8ef2d5bb52ac1a5ff9b939d24cc Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sat, 18 Mar 2023 22:55:26 +0100
Subject: [PATCH] Update to version 0.7.0; Fixes RHBZ#1948201

---
 .gitignore            |  1 +
 README.md             |  3 ---
 rust-sct.spec         | 42 +++++++++++++++++++-----------------------
 sct-fix-metadata.diff | 10 ----------
 sources               |  2 +-
 5 files changed, 21 insertions(+), 37 deletions(-)
 delete mode 100644 README.md
 delete mode 100644 sct-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 02134a7..5f3b1ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sct-0.6.0.crate
+/sct-0.7.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index ecb219c..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-sct
-
-The rust-sct package
diff --git a/rust-sct.spec b/rust-sct.spec
index 02597d9..e8642b9 100644
--- a/rust-sct.spec
+++ b/rust-sct.spec
@@ -1,30 +1,23 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate sct
 
-Name:           rust-%{crate}
-Version:        0.6.0
+Name:           rust-sct
+Version:        0.7.0
 Release:        %autorelease
 Summary:        Certificate transparency SCT verification library
 
 # Upstream license specification: Apache-2.0/ISC/MIT
-License:        ASL 2.0 or ISC or MIT
+License:        Apache-2.0 OR ISC OR MIT
 URL:            https://crates.io/crates/sct
 Source:         %{crates_source}
-# Initial patched metadata
-# * Exclude useless files, https://github.com/ctz/sct.rs/pull/5
-Patch0:         sct-fix-metadata.diff
-
-ExclusiveArch:  %{rust_arches}
-# ring is not available on those architectures
-ExcludeArch:    s390x %{power64}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
-BuildRequires:  rust-packaging
+# ring is not available on ppc64le and s390x
+ExcludeArch:    ppc64le s390x
+
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Certificate transparency SCT verification library.}
@@ -37,13 +30,16 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE LICENSE-MIT LICENSE-ISC LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-ISC
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -51,11 +47,11 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sct-fix-metadata.diff b/sct-fix-metadata.diff
deleted file mode 100644
index 063148c..0000000
--- a/sct-fix-metadata.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- sct-0.6.0/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ sct-0.6.0/Cargo.toml	2021-01-03T17:23:55.347754+00:00
-@@ -21,6 +21,7 @@
- categories = ["network-programming", "cryptography"]
- license = "Apache-2.0/ISC/MIT"
- repository = "https://github.com/ctz/sct.rs"
-+exclude = ["/admin/"]
- [dependencies.ring]
- version = "0.16.0"
- 
diff --git a/sources b/sources
index 0637d90..97dab9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sct-0.6.0.crate) = fed46a52834b90495a8bc37993ad0754f20fedef6db442368559594d7184a12b43e31a7d42a595b032e54f8aa535cae0030d9eccc828c9df2fb457267e782b15
+SHA512 (sct-0.7.0.crate) = 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046