From fec4460b6ef7f253072081eaffd80bdcba189706 Mon Sep 17 00:00:00 2001
From: Francisco Trivino <ftrivino@redhat.com>
Date: Tue, 3 Dec 2024 21:30:43 +0100
Subject: [PATCH] Update to 1.10.2

Update to a more recent version, 1.10.2. This will bump the NVR, which is required for the CRB request.

I also cherry pick https://src.fedoraproject.org/rpms/python-setuptools-rust/pull-request/10
Depend only on cargo at runtime: setuptools-rust does not use RPM macros, just cargo.
Any package which uses this would already be expected to pull in the respective macros
itself. Relaxing the dependency fixes EPEL 10 builds, as RHEL's rust-toolset and EPEL's
cargo-rpm-macros (aka rust-packaging) officially conflict. As this package is being moved
from buildroot-only to CRB, it would break EPEL 10 without this change.

Drop manually listed %license file.

Resolves: RHEL-66224

Signed-off-by: Francisco Trivino <ftrivino@redhat.com>
---
 .gitignore                  |  1 +
 python-setuptools-rust.spec | 18 +++++++-----------
 sources                     |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02e8b0f..23c2b3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /setuptools-rust-1.5.2.tar.gz
 /setuptools-rust-1.6.0.tar.gz
 /setuptools-rust-1.7.0.tar.gz
+/setuptools_rust-1.10.2.tar.gz
diff --git a/python-setuptools-rust.spec b/python-setuptools-rust.spec
index 124f048..c9868f2 100644
--- a/python-setuptools-rust.spec
+++ b/python-setuptools-rust.spec
@@ -7,13 +7,14 @@
 %global integration_tests_exc '^(html-py-ever)'
 
 Name:           python-setuptools-rust
-Version:        1.7.0
+Version:        1.10.2
 Release:        %autorelease
 Summary:        Setuptools Rust extension plugin
 
 License:        MIT
 URL:            https://github.com/PyO3/setuptools-rust
-Source0:        %{pypi_source setuptools-rust}
+Source0:        %{pypi_source setuptools_rust}
+
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -38,19 +39,15 @@ extensions written in Rust as easily as if they were written in C.}
 
 %package -n     python3-setuptools-rust
 Summary:        %{summary}
-%if 0%{?fedora}
-Requires:       rust-packaging
-%else
-Requires:       rust-toolset >= 1.45
-%endif
+Requires:       cargo
 
 %description -n python3-setuptools-rust %{_description}
 
 
 %prep
-%autosetup -n setuptools-rust-%{version}
-
 %cargo_prep
+%autosetup -p1 -n setuptools_rust-%{version}
+
 
 %if %{with integration_tests}
 for example in $(ls examples/ | grep -vE %{integration_tests_exc}); do
@@ -78,7 +75,7 @@ done
 
 %install
 %pyproject_install
-%pyproject_save_files setuptools_rust
+%pyproject_save_files -l setuptools_rust
 
 
 %check
@@ -116,7 +113,6 @@ done
 
 %files -n python3-setuptools-rust -f %{pyproject_files}
 %doc README.md CHANGELOG.md
-%license LICENSE
 
 
 %changelog
diff --git a/sources b/sources
index 6859e22..71d6b0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setuptools-rust-1.7.0.tar.gz) = 19e77be4856f6517155175272e4b1ec1eca7a75f73a94ec2e9c26d6b1fe217a7dda3ee6454a30aa477dedea15d7eb723d0f8753700e2d8dec303d58b03712c6e
+SHA512 (setuptools_rust-1.10.2.tar.gz) = 4a97ece7d42856532c9517ec1cc5ad7d8f765b8b4157ffcf458688478db7b3d1b4aa10898ebedd2251e3d29d80e81b45ad93128ae72bc270794f77c006ece324