diff --git a/ruby-common.changes b/ruby-common.changes index 0b4708f..648b69e 100644 --- a/ruby-common.changes +++ b/ruby-common.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 10 09:26:26 UTC 2019 - Dominique Leuenberger + +- Move RPM macros to %_rpmmacrodir. + ------------------------------------------------------------------- Thu Feb 7 20:30:00 UTC 2019 - Marcus Rueckert diff --git a/ruby-common.spec b/ruby-common.spec index f8cde82..2ca3074 100644 --- a/ruby-common.spec +++ b/ruby-common.spec @@ -84,8 +84,8 @@ Rails packaging support files. %if %{with ship_gemrc} install -D -m 0644 %{S:2} %{buildroot}/etc/gemrc %endif -install -D -m 0644 %{S:8} %{buildroot}/etc/rpm/macros.ruby-common -install -D -m 0644 %{S:9} %{buildroot}/etc/rpm/macros.suse-ruby +install -D -m 0644 %{S:8} %{buildroot}%{_rpmmacrodir}/macros.ruby-common +install -D -m 0644 %{S:9} %{buildroot}%{_rpmmacrodir}/macros.suse-ruby install -D -m 0644 %{S:4} %{buildroot}/usr/lib/rpm/fileattrs/rubygems.attr install -D -m 0755 %{S:5} %{buildroot}/usr/lib/rpm/rubygemsdeps.rb install -D -m 0755 %{S:6} %{buildroot}/usr/lib/rpm/gem_install.sh @@ -96,7 +96,7 @@ install -D -m 0644 %{S:11} %{buildroot}/usr/lib/rpm/gem_packages.template install -D -m 0755 %{S:12} %{buildroot}%{_bindir}/ruby-find-versioned install -D -m 0644 %{S:13} %{buildroot}/usr/lib/rpm/fileattrs/gemfile.attr install -D -m 0755 %{S:14} %{buildroot}/usr/lib/rpm/gemfile.rb -install -D -m 0644 %{S:15} %{buildroot}/etc/rpm/macros.rails +install -D -m 0644 %{S:15} %{buildroot}%{_rpmmacrodir}/macros.rails install -D -m 0755 %{S:16} %{buildroot}%{_bindir}/g2r install -D -m 0644 %{S:17} %{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.attr @@ -105,7 +105,7 @@ install -D -m 0644 %{S:17} %{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.a %if %{with ship_gemrc} %config /etc/gemrc %endif -%config /etc/rpm/macros.*ruby* +%{_rpmmacrodir}/macros.*ruby* %dir /usr/lib/rpm/fileattrs /usr/lib/rpm/fileattrs/rubygems.attr /usr/lib/rpm/fileattrs/rubygems_bundled.attr @@ -119,7 +119,7 @@ install -D -m 0644 %{S:17} %{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.a %files rails %defattr(-,root,root) -%config /etc/rpm/macros.rails +%{_rpmmacrodir}/macros.rails /usr/lib/rpm/fileattrs/gemfile.attr /usr/lib/rpm/gemfile.rb