diff --git a/rust-packaging-26.3.tar.gz b/rust-packaging-26.3.tar.gz deleted file mode 100644 index 479d1379322b9b90e23dc8a1665023cb42e823e7..0000000000000000000000000000000000000000 Binary files a/rust-packaging-26.3.tar.gz and /dev/null differ diff --git a/rust-packaging-26.4.tar.gz b/rust-packaging-26.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c84209d466448894f6a475e568a8d0369f47042d Binary files /dev/null and b/rust-packaging-26.4.tar.gz differ diff --git a/rust-packaging.spec b/rust-packaging.spec index aced4c92110d71686fb7531c258325e96cde0303..ed031f26f346286f8438987327b3bb786d02f61c 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -1,7 +1,7 @@ %bcond_without check Name: rust-packaging -Version: 26.3 +Version: 26.4 Release: 1 Summary: RPM macros and generators for building Rust packages License: MIT @@ -20,18 +20,15 @@ BuildRequires: python3-pytest %description %{summary}. -%if ! 0%{?rhel} %package -n rust-srpm-macros Summary: RPM macros for building Rust projects %description -n rust-srpm-macros RPM macros for building source packages for Rust projects. -%endif %package -n cargo-rpm-macros Summary: RPM macros for building projects with cargo -# obsolete + provide rust-packaging (removed in Fedora 38) Obsoletes: rust-packaging < 24 Provides: rust-packaging = %{version}-%{release} @@ -41,13 +38,7 @@ Requires: cargo Requires: gawk Requires: grep -%if ! 0%{?rhel} Requires: rust-srpm-macros = %{version}-%{release} -%else -# The "rust-srpm-macros" package is built from the "rust" source package in -# RHEL, so the package follows a different versioning scheme. -Requires: rust-srpm-macros -%endif %description -n cargo-rpm-macros RPM macros for building projects with cargo. @@ -61,28 +52,25 @@ RPM macros for building projects with cargo. %install install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.cargo install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust -%if ! 0%{?rhel} install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust-srpm -%endif install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo.attr install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo_vendor.attr -%if ! 0%{?rhel} %files -n rust-srpm-macros %license LICENSE %{_rpmmacrodir}/macros.rust %{_rpmmacrodir}/macros.rust-srpm -%endif %files -n cargo-rpm-macros %license LICENSE %{_rpmmacrodir}/macros.cargo -%if 0%{?rhel} %{_rpmmacrodir}/macros.rust -%endif %{_fileattrsdir}/cargo.attr %{_fileattrsdir}/cargo_vendor.attr %changelog +* Thu Oct 30 2025 xu_ping <707078654@qq.com> - 26.4-1 +- Upgrade version to 26.4 + * Tue Oct 15 2024 jianglong - 26.3-1 - Package init