packages: rpm-build-macros/rpm-build-macros.spec - 1.522: add force flag -f...

[glen]

Author: glen                         Date: Fri Jul 31 11:41:49 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.522: add force flag -f to %webapp_register
- version check in %build

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.220 -> 1.221) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.220 packages/rpm-build-macros/rpm-build-macros.spec:1.221
--- packages/rpm-build-macros/rpm-build-macros.spec:1.220	Mon Jun 15 17:35:10 2009
+++ packages/rpm-build-macros/rpm-build-macros.spec	Fri Jul 31 13:41:44 2009
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.520
+%define		rpm_macros_rev	1.522
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -45,7 +45,15 @@
 
 %prep
 %setup -qcT
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+cp %{SOURCE0} .
+#%patch0 -p1
+
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%endif
+
+%build
+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
@@ -55,13 +63,6 @@
 	: Update find_lang_rev define to $rev, and retry
 	exit 1
 fi
-cp %{SOURCE0} .
-
-%if "%{pld_release}" == "ac"
-%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
-%endif
-
-#%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.221  2009/07/31 11:41:44  glen
+- 1.522: add force flag -f to %webapp_register
+- version check in %build
+
 Revision 1.220  2009/06/15 15:35:10  glen
 - %_usrlibrpm is in rpm 4.4.9 too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.220&r2=1.221&f=u