SPECS (AC-branch): rpm-build-macros.spec - update macros to 1.387; ...

[glen]

Author: glen                         Date: Tue Jul  3 22:10:39 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update macros to 1.387; keeping ac-kernel macros

---- Files affected:
SPECS:
   rpm-build-macros.spec (1.112.2.2 -> 1.112.2.3) 

---- Diffs:

================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.112.2.2 SPECS/rpm-build-macros.spec:1.112.2.3
--- SPECS/rpm-build-macros.spec:1.112.2.2	Tue May 22 22:25:18 2007
+++ SPECS/rpm-build-macros.spec	Wed Jul  4 00:10:34 2007
@@ -1,15 +1,16 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev 1.375
+%define		rpm_macros_rev 1.387
 Summary:	PLD Linux RPM build macros
 Summary(pl):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	1
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
 Source1:	service_generator.sh
 Source2:	rpm-build.sh
+Patch0:		rpm-build-kernel.patch
 Requires:	findutils >= 1:4.2.26
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:	rpm-macros
@@ -30,16 +31,19 @@
 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
 fi
+%patch0 -p1
 
 %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
 
@@ -58,6 +62,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112.2.3  2007/07/03 22:10:34  glen
+- update macros to 1.387; keeping ac-kernel macros
+
 Revision 1.112.2.2  2007/05/22 20:25:18  glen
 - rel 2
 
================================================================

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