Merge and update to 25.2-1

.gitignore

@@ -1 +1 @@
-SOURCES/rust-packaging-24.tar.gz
+SOURCES/rust-packaging-25.2.tar.gz

.rust-packaging.metadata

@@ -1 +1 @@
-38cd3a5a6080273c703ba6071d297e6763af12c7  SOURCES/rust-packaging-24.tar.gz
+1e5e05c94ff76c5d8eac0101d524ace75e1da078  SOURCES/rust-packaging-25.2.tar.gz

SPECS/rust-packaging.spec

@@ -2,14 +2,16 @@
 ## (rpmautospec version 0.3.5)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 6;
+    release_number = 1;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
+%bcond_without check
+
 Name:           rust-packaging
-Version:        24
+Version:        25.2
 Release:        %autorelease
 Summary:        RPM macros and generators for building Rust packages
 License:        MIT
@@ -17,15 +19,12 @@ License:        MIT
 URL:            https://pagure.io/fedora-rust/rust-packaging
 Source:         %{url}/archive/%{version}/rust-packaging-%{version}.tar.gz
 
-# backported upstream patches for minor fixes
-Patch:          https://pagure.io/fedora-rust/rust-packaging/c/3df6ad1.patch
-Patch:          https://pagure.io/fedora-rust/rust-packaging/c/b9d6410.patch
-Patch:          https://pagure.io/fedora-rust/rust-packaging/c/8690145.patch
-Patch:          https://pagure.io/fedora-rust/rust-packaging/c/0ff9bb8.patch
-Patch:          https://pagure.io/fedora-rust/rust-packaging/c/801dd51.patch
-
 BuildArch:      noarch
 
+%if %{with check}
+BuildRequires:  python3.11-pytest
+%endif
+
 %description
 %{summary}.
 
@@ -44,9 +43,11 @@ Summary:        RPM macros for building projects with cargo
 Obsoletes:      rust-packaging < 24
 Provides:       rust-packaging = %{version}-%{release}
 
+Requires:       cargo2rpm >= 0.1.8
+
 Requires:       cargo
-Requires:       cargo2rpm >= 0.1.0
 Requires:       gawk
+Requires:       grep
 
 Requires:       rust-srpm-macros-epel = %{version}-%{release}
 
@@ -70,6 +71,14 @@ install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust
 %dnl install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust-srpm
 
 install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo.attr
+install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo_vendor.attr
+
+%if %{with check}
+%check
+export MACRO_DIR=%{buildroot}%{_rpmmacrodir}
+# skip tests that fail due to whitespace differences in expected strings
+pytest-3.11 -vv -k "not test_cargo_prep"
+%endif
 
 %files -n rust-srpm-macros-epel
 %license LICENSE
@@ -80,11 +89,21 @@ install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo.attr
 %license LICENSE
 %{_rpmmacrodir}/macros.cargo
 %{_fileattrsdir}/cargo.attr
+%{_fileattrsdir}/cargo_vendor.attr
 
 %changelog
-* Wed Oct 04 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 24-6
+* Wed Oct 04 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 25.2-1
 - Rebuilt for MSVSphere 9.2
 
+* Sat Sep 30 2023 Fabio Valentini <decathorpe@gmail.com> - 25.2-1
+- Update to version 25.2
+
+* Sat Sep 30 2023 Fabio Valentini <decathorpe@gmail.com> - 25.1-1
+- Update to version 25.1; Fixes RHBZ#2241437
+
+* Sat Sep 30 2023 Fabio Valentini <decathorpe@gmail.com> - 25.0-1
+- Update to version 25.0
+
 * Thu Aug 17 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 24-6
 - Correct cargo_registry path