packages: openldap/openldap.spec - reordered patches

baggins baggins at pld-linux.org
Mon Mar 28 17:39:45 CEST 2011


Author: baggins                      Date: Mon Mar 28 15:39:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reordered patches

---- Files affected:
packages/openldap:
   openldap.spec (1.346 -> 1.347) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.346 packages/openldap/openldap.spec:1.347
--- packages/openldap/openldap.spec:1.346	Sun Mar 27 12:57:54 2011
+++ packages/openldap/openldap.spec	Mon Mar 28 17:39:39 2011
@@ -56,13 +56,13 @@
 Patch9:		%{name}-ltinstall-mode.patch
 Patch10:	%{name}-whowhere.patch
 Patch11:	%{name}-ldaprc.patch
-Patch13:	%{name}-nosql.patch
-Patch14:	%{name}-smbk5pwd.patch
-Patch15:	%{name}-ldapc++.patch
-Patch16:	%{name}-pie.patch
-Patch17:	%{name}-gethostbyXXXX_r.patch
+Patch12:	%{name}-nosql.patch
+Patch13:	%{name}-ldapc++.patch
+Patch14:	%{name}-pie.patch
+Patch15:	%{name}-gethostbyXXXX_r.patch
+Patch16:	%{name}-smbk5pwd-shadowLastChange.patch
+Patch17:	%{name}-smbk5pwd.patch
 Patch18:	%{name}-smbk5pwd-heimdal.patch
-Patch19:	%{name}-smbk5pwd-shadowLastChange.patch
 # Patch for the evolution library
 Patch100:	%{name}-ntlm.diff
 URL:		http://www.openldap.org/
@@ -938,16 +938,16 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %patch13 -p1
-%if %{with krb5}
 %patch14 -p1
+%patch15 -p1
+%patch16 -p0
+%if %{with krb5}
+%patch17 -p1
 %else
 %patch18 -p1
 %endif
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch19 -p0
 
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays/smbk5pwd.c
 cd ..
@@ -1857,6 +1857,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.347  2011/03/28 15:39:39  baggins
+- reordered patches
+
 Revision 1.346  2011/03/27 10:57:54  baggins
 - 2.4.25
 - db patch obsoleted by upstream fix
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.346&r2=1.347&f=u



More information about the pld-cvs-commit mailing list