From 7adae7548de4b4e9577e9f9dfcb40b567b4af134 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 22 Feb 2023 17:47:31 -0600 Subject: [PATCH] rust-srpm-macros -> rust-srpm-macros-epel on epel9 --- rust-packaging.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rust-packaging.spec b/rust-packaging.spec index 4fac3ac..23a73a0 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -12,10 +12,10 @@ BuildArch: noarch %description %{summary}. -%package -n rust-srpm-macros +%package -n rust-srpm-macros-epel Summary: RPM macros for building Rust projects -%description -n rust-srpm-macros +%description -n rust-srpm-macros-epel RPM macros for building source packages for Rust projects. %package -n cargo-rpm-macros @@ -43,13 +43,19 @@ 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 -install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust-srpm + +# We don't install these on RHEL 9, as they conflict with the regular +# rust-srpm-macros. +# If we need to override these, they can be installed as +# macros.zzz-rust-srpm-epel. +%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 -%files -n rust-srpm-macros +%files -n rust-srpm-macros-epel %license LICENSE %{_rpmmacrodir}/macros.rust -%{_rpmmacrodir}/macros.rust-srpm +%dnl %{_rpmmacrodir}/macros.rust-srpm %files -n cargo-rpm-macros %license LICENSE