SPECS: rpm-macros.spec - use /etc/rpm/macros.pld due current macro...

[glen]

Author: glen                         Date: Sun Jun 19 21:52:00 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use /etc/rpm/macros.pld due current macrofiles setting in rpmrc:
  macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.*:....
  otherwise the rpm.macros copy wasn't readed (processed) at all

---- Files affected:
SPECS:
   rpm-macros.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/rpm-macros.spec
diff -u SPECS/rpm-macros.spec:1.7 SPECS/rpm-macros.spec:1.8
--- SPECS/rpm-macros.spec:1.7	Sun Jun 19 21:14:16 2005
+++ SPECS/rpm-macros.spec	Sun Jun 19 23:51:54 2005
@@ -8,7 +8,7 @@
 Summary:	PLD Linux RPM Macros
 Name:		rpm-macros
 Version:	%{rpm_macros_rev}
-Release:	0.3
+Release:	0.4
 License:	GPL
 Group:		Base
 Source0:	rpm.macros
@@ -32,14 +32,14 @@
 sed -e '
 # truncate until %%_topdir macro
 1,/^%%_topdir/d
-' %{SOURCE0} > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/rpm.macros
+' %{SOURCE0} > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pld
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/rpm.macros
+%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -47,6 +47,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/06/19 21:51:54  glen
+- use /etc/rpm/macros.pld due current macrofiles setting in rpmrc:
+  macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.*:....
+  otherwise the rpm.macros copy wasn't readed (processed) at all
+
 Revision 1.7  2005/06/19 19:14:16  glen
 - add conflicts on rpm < 4.4.1 because in rpm.macros currently in AC-branch
   will expand in %install _enable_debug_packages, even if it's defined to 0.
@@ -55,14 +60,12 @@
 
   rpm-4.4.1:
   %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
-  %%install\
 
   rpm-4.3-0.20040107.62:
   %install \
   %if 0%{?_enable_debug_packages}\
   %{?buildsubdir:%{debug_package}}\
   %endif\
-  %%install\
 
 Revision 1.6  2005/06/19 18:01:19  glen
 - version eq rpm_macros_rev
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm-macros.spec?r1=1.7&r2=1.8&f=u