From 8f9fe41ba62c7ceee07696c2766aec44e962df94 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Mar 08 2023 12:09:30 +0000
Subject: [PATCH 1/2] Use `%{_rpmmacrodir}` for RPM macros.


---

diff --git a/ruby.spec b/ruby.spec
index 13f0b60..6959f72 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -720,11 +720,11 @@ test ! "$(ls -A %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/ 2>/dev/null)"
 
 # Move macros file into proper place and replace the %%{name} macro, since it
 # would be wrongly evaluated during build of other packages.
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
-install -m 644 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby
-sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby
-install -m 644 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems
-sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems
+mkdir -p %{buildroot}%{_rpmmacrodir}
+install -m 644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/macros.ruby
+sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.ruby
+install -m 644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.rubygems
+sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.rubygems
 
 # Install dependency generators.
 mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs
@@ -1032,7 +1032,7 @@ mv test/ruby/test_jit.rb{,.disable} || :
 %license GPL
 %license LEGAL
 
-%{_rpmconfigdir}/macros.d/macros.ruby
+%{_rpmmacrodir}/macros.ruby
 
 %{_includedir}/*
 %{_libdir}/libruby.so
@@ -1259,7 +1259,7 @@ mv test/ruby/test_jit.rb{,.disable} || :
 %exclude %{gem_dir}/cache/*
 
 %files -n rubygems-devel
-%{_rpmconfigdir}/macros.d/macros.rubygems
+%{_rpmmacrodir}/macros.rubygems
 %{_rpmconfigdir}/fileattrs/rubygems.attr
 %{_rpmconfigdir}/rubygems.req
 %{_rpmconfigdir}/rubygems.prov

From 31778c5ebd1fed2468465e60c51ac75d783867b3 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Mar 08 2023 12:11:49 +0000
Subject: [PATCH 2/2] Use `%{_fileattsdir}` for RPM macro generator.


---

diff --git a/ruby.spec b/ruby.spec
index 6959f72..04271e6 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -727,8 +727,8 @@ install -m 644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.rubygems
 sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmmacrodir}/macros.rubygems
 
 # Install dependency generators.
-mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs
-install -m 644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/fileattrs
+mkdir -p %{buildroot}%{_fileattrsdir}
+install -m 644 %{SOURCE8} %{buildroot}%{_fileattrsdir}
 install -m 755 %{SOURCE9} %{buildroot}%{_rpmconfigdir}
 install -m 755 %{SOURCE10} %{buildroot}%{_rpmconfigdir}
 install -m 755 %{SOURCE11} %{buildroot}%{_rpmconfigdir}
@@ -1260,7 +1260,7 @@ mv test/ruby/test_jit.rb{,.disable} || :
 
 %files -n rubygems-devel
 %{_rpmmacrodir}/macros.rubygems
-%{_rpmconfigdir}/fileattrs/rubygems.attr
+%{_fileattrsdir}/rubygems.attr
 %{_rpmconfigdir}/rubygems.req
 %{_rpmconfigdir}/rubygems.prov
 %{_rpmconfigdir}/rubygems.con