From c106478902ca2bafecb0ff42fd7f63f16e5f2c02 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 14 Nov 2023 00:49:29 +0100
Subject: [PATCH] Update to version 0.20.0; Fixes RHBZ#2243416

---
 .gitignore                 |  1 +
 pyo3-ffi-fix-metadata.diff |  4 ++--
 rust-pyo3-ffi.spec         | 15 ++++++++-------
 rust2rpm.conf              |  5 -----
 rust2rpm.toml              |  4 ++++
 sources                    |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index 4f644f1..91c58ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /pyo3-ffi-0.18.3.crate
 /pyo3-ffi-0.19.1.crate
 /pyo3-ffi-0.19.2.crate
+/pyo3-ffi-0.20.0.crate
diff --git a/pyo3-ffi-fix-metadata.diff b/pyo3-ffi-fix-metadata.diff
index 9f47974..32a9333 100644
--- a/pyo3-ffi-fix-metadata.diff
+++ b/pyo3-ffi-fix-metadata.diff
@@ -1,5 +1,5 @@
---- pyo3-ffi-0.19.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ pyo3-ffi-0.19.2/Cargo.toml	2023-08-01T13:21:17.556533+00:00
+--- pyo3-ffi-0.20.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ pyo3-ffi-0.20.0/Cargo.toml	2023-11-13T23:45:21.194275+00:00
 @@ -62,4 +62,3 @@
  ]
  default = []
diff --git a/rust-pyo3-ffi.spec b/rust-pyo3-ffi.spec
index dc51a8a..75f5a68 100644
--- a/rust-pyo3-ffi.spec
+++ b/rust-pyo3-ffi.spec
@@ -1,22 +1,22 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate pyo3-ffi
 
 Name:           rust-pyo3-ffi
-Version:        0.19.2
+Version:        0.20.0
 Release:        %autorelease
 Summary:        Python-API bindings for the PyO3 ecosystem
 
-License:        Apache-2.0
+License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/pyo3-ffi
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * drop MSVC- and MinGW-only features
 Patch:          pyo3-ffi-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Python-API bindings for the PyO3 ecosystem.}
@@ -26,6 +26,7 @@ Python-API bindings for the PyO3 ecosystem.}
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
+Requires:       python3-devel >= 3.7
 
 %description    devel %{_description}
 
@@ -33,14 +34,14 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license %{crate_instdir}/LICENSE
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
 %doc %{crate_instdir}/README.md
 %{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
 BuildArch:      noarch
-Requires:       python3-devel >= 3.7
 
 %description -n %{name}+default-devel %{_description}
 
@@ -135,7 +136,7 @@ use the "extension-module" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index 5d63536..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-buildrequires =
-  python3-devel >= 3.7
-lib+default.requires =
-  python3-devel >= 3.7
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..613939e
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,4 @@
+[requires]
+build = ["python3-devel >= 3.7"]
+lib = ["python3-devel >= 3.7"]
+
diff --git a/sources b/sources
index c166557..16187af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pyo3-ffi-0.19.2.crate) = 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32
+SHA512 (pyo3-ffi-0.20.0.crate) = a68f0b1380f2ac3d3034ac8b3788cd6573850137c6678694cbcc3e814b619510b9b21b11704c2e702d4eb7433d8b1d3a6dac663501b6db5197a409407802b714