From 230ae0c65c9c719221d668037e4400bdeac9ee40 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Apr 16 2024 17:54:39 +0000
Subject: [rhel] Rename rust-srpm-macros to rust-toolset-srpm-macros


The upgrade path was broken because the Rust version compares less than
the rust2rpm-based package version that was in RHEL 8 and 9. With a new
name and appropriate Obsoletes and Provides, it should upgrade cleanly.

Ref: https://issues.redhat.com/browse/RHEL-30636

---

diff --git a/rust.spec b/rust.spec
index 5960f56..e6c5a3a 100644
--- a/rust.spec
+++ b/rust.spec
@@ -557,11 +557,15 @@ useful as a reference for code completion tools in various editors.
 
 %if 0%{?rhel}
 
-%package srpm-macros
+%package toolset-srpm-macros
 Summary:        RPM macros for building Rust source packages
 BuildArch:      noarch
 
-%description srpm-macros
+# This used to be from its own source package, versioned like rust2rpm.
+Obsoletes:      rust-srpm-macros < 18~
+Provides:       rust-srpm-macros = 25.2
+
+%description toolset-srpm-macros
 RPM macros for building source packages for Rust projects.
 
 
@@ -1083,7 +1087,7 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
 
 %if 0%{?rhel}
-%files srpm-macros
+%files toolset-srpm-macros
 %{rpmmacrodir}/macros.rust-srpm
 
 %files toolset