[packages/rpm-build-macros/rpm.org: 6/8] - rpm.org wants macros in macros.d to be named macros.<something>

baggins baggins at pld-linux.org
Tue Jan 7 07:48:36 CET 2020 

commit 79828fe2c5c06f3af41b8a8857c988eace1490b6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jan 6 20:38:16 2020 +0900

    - rpm.org wants macros in macros.d to be named macros.<something>

 rpm-build-macros.spec | 84 +++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index ca90620..71ec2b4 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary:	PLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa PLD
 Name:		rpm-pld-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	2.2
 License:	GPL
 Group:		Development/Building
 Source0:	macros.pld
@@ -191,46 +191,46 @@ cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_usrlibrpm}/pld/rpmrc
 cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_usrlibrpm}/compress-doc
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_usrlibrpm}/find-spec-bcond
 
-cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/kernel
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.kernel
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/kernel.attr
 
 cp -p service_generator.sh $RPM_BUILD_ROOT%{_usrlibrpm}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}/dokuwiki-find-lang.sh
 
-cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/ruby
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.ruby
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/ruby.attr
 cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_usrlibrpm}/rubygems.rb
 cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_usrlibrpm}/gem_helper.rb
 
-cp -p %{SOURCE20} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/java
+cp -p %{SOURCE20} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.java
 cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/java.attr
 cp -p %{SOURCE22} $RPM_BUILD_ROOT%{_usrlibrpm}/java-find-requires
 cp -p %{SOURCE23} $RPM_BUILD_ROOT%{_usrlibrpm}/eclipse-feature.xslt
 
-cp -p %{SOURCE30} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/php
+cp -p %{SOURCE30} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.php
 cp -p %{SOURCE31} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/php.attr
 cp -p %{SOURCE32} $RPM_BUILD_ROOT%{_usrlibrpm}/php.prov
 cp -p %{SOURCE33} $RPM_BUILD_ROOT%{_usrlibrpm}/php.req
 cp -p %{SOURCE34} $RPM_BUILD_ROOT%{_usrlibrpm}/php.req.php
 
-cp -p %{SOURCE40} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/browser-plugins
-cp -p %{SOURCE41} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/cacti
-cp -p %{SOURCE42} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/emacs
-cp -p %{SOURCE43} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/ghc
-cp -p %{SOURCE44} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/nagios
-cp -p %{SOURCE45} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/openldap
-cp -p %{SOURCE46} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/perl
-cp -p %{SOURCE47} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/python
-cp -p %{SOURCE48} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/systemd
-cp -p %{SOURCE49} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/tcl
-cp -p %{SOURCE50} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/upstart
-cp -p %{SOURCE51} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/webapp
-cp -p %{SOURCE52} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/xmms
-cp -p %{SOURCE53} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/xorg
-cp -p %{SOURCE54} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/selinux
-
-cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/gstreamer
+cp -p %{SOURCE40} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.browser-plugins
+cp -p %{SOURCE41} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.cacti
+cp -p %{SOURCE42} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.emacs
+cp -p %{SOURCE43} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.ghc
+cp -p %{SOURCE44} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.nagios
+cp -p %{SOURCE45} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.openldap
+cp -p %{SOURCE46} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.perl
+cp -p %{SOURCE47} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.python
+cp -p %{SOURCE48} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.systemd
+cp -p %{SOURCE49} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.tcl
+cp -p %{SOURCE50} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.upstart
+cp -p %{SOURCE51} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.webapp
+cp -p %{SOURCE52} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.xmms
+cp -p %{SOURCE53} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.xorg
+cp -p %{SOURCE54} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.selinux
+
+cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.gstreamer
 cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/gstreamer.attr
 
 %clean
@@ -249,26 +249,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_usrlibrpm}/fileattrs/php.attr
 %{_usrlibrpm}/fileattrs/ruby.attr
 
-%{_usrlibrpm}/macros.d/browser-plugins
-%{_usrlibrpm}/macros.d/cacti
-%{_usrlibrpm}/macros.d/emacs
-%{_usrlibrpm}/macros.d/ghc
-%{_usrlibrpm}/macros.d/gstreamer
-%{_usrlibrpm}/macros.d/java
-%{_usrlibrpm}/macros.d/kernel
-%{_usrlibrpm}/macros.d/nagios
-%{_usrlibrpm}/macros.d/openldap
-%{_usrlibrpm}/macros.d/perl
-%{_usrlibrpm}/macros.d/php
-%{_usrlibrpm}/macros.d/python
-%{_usrlibrpm}/macros.d/ruby
-%{_usrlibrpm}/macros.d/selinux
-%{_usrlibrpm}/macros.d/systemd
-%{_usrlibrpm}/macros.d/tcl
-%{_usrlibrpm}/macros.d/upstart
-%{_usrlibrpm}/macros.d/webapp
-%{_usrlibrpm}/macros.d/xmms
-%{_usrlibrpm}/macros.d/xorg
+%{_usrlibrpm}/macros.d/macros.browser-plugins
+%{_usrlibrpm}/macros.d/macros.cacti
+%{_usrlibrpm}/macros.d/macros.emacs
+%{_usrlibrpm}/macros.d/macros.ghc
+%{_usrlibrpm}/macros.d/macros.gstreamer
+%{_usrlibrpm}/macros.d/macros.java
+%{_usrlibrpm}/macros.d/macros.kernel
+%{_usrlibrpm}/macros.d/macros.nagios
+%{_usrlibrpm}/macros.d/macros.openldap
+%{_usrlibrpm}/macros.d/macros.perl
+%{_usrlibrpm}/macros.d/macros.php
+%{_usrlibrpm}/macros.d/macros.python
+%{_usrlibrpm}/macros.d/macros.ruby
+%{_usrlibrpm}/macros.d/macros.selinux
+%{_usrlibrpm}/macros.d/macros.systemd
+%{_usrlibrpm}/macros.d/macros.tcl
+%{_usrlibrpm}/macros.d/macros.upstart
+%{_usrlibrpm}/macros.d/macros.webapp
+%{_usrlibrpm}/macros.d/macros.xmms
+%{_usrlibrpm}/macros.d/macros.xorg
 
 %attr(755,root,root) %{_usrlibrpm}/compress-doc
 %attr(755,root,root) %{_usrlibrpm}/dokuwiki-find-lang.sh
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/0c4a87cbfb5cfc4b9a707f657b25f01e04db0843

More information about the pld-cvs-commit mailing list