#152 Utilize moder RPM macros
Merged a year ago by vondruch. Opened a year ago by vondruch.
rpms/ vondruch/ruby rpm-macros  into  rawhide

file modified
+10 -10
@@ -720,15 +720,15 @@ 

  

  # 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

- 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}
@@ -1032,7 +1032,7 @@ 

  %license GPL

  %license LEGAL

  

- %{_rpmconfigdir}/macros.d/macros.ruby

+ %{_rpmmacrodir}/macros.ruby

  

  %{_includedir}/*

  %{_libdir}/libruby.so
@@ -1259,8 +1259,8 @@ 

  %exclude %{gem_dir}/cache/*

  

  %files -n rubygems-devel

- %{_rpmconfigdir}/macros.d/macros.rubygems

- %{_rpmconfigdir}/fileattrs/rubygems.attr

+ %{_rpmmacrodir}/macros.rubygems

+ %{_fileattrsdir}/rubygems.attr

  %{_rpmconfigdir}/rubygems.req

  %{_rpmconfigdir}/rubygems.prov

  %{_rpmconfigdir}/rubygems.con

no initial comment

Just quickly pushed out some minor changes lying on my disk. It is probably good time to include them with Ruby 3.2 rebase. @jackorp PTAL

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/48513aa1f4124751a9dad15dbee3b5ed

Pull-Request has been merged by vondruch

a year ago
Metadata