SPECS: rpm-build-macros.spec - easier to merge with AC-branch

[glen]

Author: glen                         Date: Tue Jul  3 22:12:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- easier to merge with AC-branch

---- Files affected:
SPECS:
   rpm-build-macros.spec (1.126 -> 1.127) 

---- Diffs:

================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.126 SPECS/rpm-build-macros.spec:1.127
--- SPECS/rpm-build-macros.spec:1.126	Sun Jun 17 12:08:01 2007
+++ SPECS/rpm-build-macros.spec	Wed Jul  4 00:12:17 2007
@@ -31,7 +31,9 @@
 Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+%setup -qcT
+cp %{SOURCE0} rpm.macros
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
 if [ "$rev" != "%rpm_macros_rev" ]; then
 	: Update rpm_macros_rev define to $rev, and retry
 	exit 1
@@ -40,7 +42,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp %{SOURCE0} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
 install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
 
@@ -59,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2007/07/03 22:12:17  glen
+- easier to merge with AC-branch
+
 Revision 1.126  2007/06/17 10:08:01  qboosh
 - fixed typo in rev 1.122 of commit log
 
================================================================

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