SPECS (AC-branch): rpm.spec - make easier th sync

[glen]

Author: glen                         Date: Thu Mar 27 17:49:40 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- make easier th sync

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.31 -> 1.837.2.42.2.32) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.31 SPECS/rpm.spec:1.837.2.42.2.32
--- SPECS/rpm.spec:1.837.2.42.2.31	Thu Mar 27 18:43:41 2008
+++ SPECS/rpm.spec	Thu Mar 27 18:49:35 2008
@@ -60,9 +60,8 @@
 # http://svn.pld-linux.org/banner.sh/
 Source17:	banner.sh
 Patch1067:	%{name}-disable-features.patch
-Patch1068:	%{name}-rpmrc-ac.patch
 Patch1069:	%{name}-parentdirs.patch
-Patch1070:	%{name}-macros-ac.patch
+Patch1070:	%{name}-rpmrc-ac.patch
 
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
@@ -82,7 +81,7 @@
 Patch15:	%{name}-system_libs-more.patch
 Patch16:	%{name}-php-deps.patch
 Patch17:	%{name}-ldconfig-always.patch
-
+Patch18:	%{name}-macros-ac.patch
 Patch19:	%{name}-link.patch
 Patch20:	%{name}-magic-usesystem.patch
 Patch21:	%{name}-dontneedutils.patch
@@ -704,6 +703,7 @@
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%patch18 -p1
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
@@ -723,7 +723,6 @@
 cp %{SOURCE8} RPM-GPG-KEY
 
 %patch1067 -p1
-%patch1068 -p1
 %patch1069 -p1
 %patch1070 -p1
 
@@ -1343,6 +1342,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.32  2008-03-27 17:49:35  glen
+- make easier th sync
+
 Revision 1.837.2.42.2.31  2008-03-27 17:43:41  glen
 - add %pld_release macro; rel 56
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.31&r2=1.837.2.42.2.32&f=u