rpms/openldap/devel openldap-2.3.37-smbk5pwd.patch, 1.1, 1.2 openldap.spec, 1.84, 1.85 openldap-1.2.11-cldap.patch, 1.1, NONE openldap-2.2.15-config.patch, 1.2, NONE openldap-2.3.11-ads.patch, 1.1, NONE

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29837

Modified Files:
	openldap-2.3.37-smbk5pwd.patch openldap.spec 
Removed Files:
	openldap-1.2.11-cldap.patch openldap-2.2.15-config.patch 
	openldap-2.3.11-ads.patch 
Log Message:
patch cleanup

openldap-2.3.37-smbk5pwd.patch:

Index: openldap-2.3.37-smbk5pwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap-2.3.37-smbk5pwd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.3.37-smbk5pwd.patch	31 Jul 2007 15:35:51 -0000	1.1
+++ openldap-2.3.37-smbk5pwd.patch	1 Aug 2007 08:00:07 -0000	1.2
@@ -1,3 +1,5 @@
+Compile smbk5pwd together with other overlays.
+
 --- openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README.smbk5pwd	2005-11-14 19:06:04.000000000 +0100
 +++ openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README	2007-07-09 09:44:43.000000000 +0200
 @@ -1,3 +1,8 @@


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- openldap.spec	31 Jul 2007 15:35:51 -0000	1.84
+++ openldap.spec	1 Aug 2007 08:00:07 -0000	1.85
@@ -32,23 +32,20 @@
 
 # Patches that are still valid for 2.3
 Patch0: openldap-2.3.34-config.patch
-Patch1: openldap-1.2.11-cldap.patch
-Patch2: openldap-2.0.11-ldaprc.patch
-Patch3: openldap-2.2.13-setugid.patch
-Patch4: openldap-2.2.13-pie.patch
-Patch5: openldap-2.3.11-toollinks.patch
-Patch6: openldap-2.3.11-nosql.patch
-#Patch7: openldap-2.3.19-nostrip.patch
-Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
-Patch9: openldap-2.3.34-quiet-slaptest.patch
-Patch10: openldap-2.3.34-pthread.patch
-Patch11: openldap-2.3.37-smbk5pwd.patch
+Patch1: openldap-2.0.11-ldaprc.patch
+Patch2: openldap-2.2.13-setugid.patch
+Patch3: openldap-2.2.13-pie.patch
+Patch4: openldap-2.3.11-toollinks.patch
+Patch5: openldap-2.3.11-nosql.patch
+Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
+Patch7: openldap-2.3.34-quiet-slaptest.patch
+Patch8: openldap-2.3.34-pthread.patch
+Patch9: openldap-2.3.37-smbk5pwd.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
 Patch101: openldap-2.2.23-resolv.patch
 Patch102: openldap-2.2.29-ads.patch
-#Patch103: openldap-2.2.29-nostrip.patch
 
 # Patches for the evolution library
 Patch200: openldap-ntlm.diff
@@ -171,17 +168,15 @@
 
 pushd openldap-%{version_23}
 %patch0 -p1 -b .config
-%patch1 -p1 -b .cldap
-%patch2 -p1 -b .ldaprc
-%patch3 -p1 -b .setugid
-%patch4 -p1 -b .pie
-%patch5 -p1 -b .toollinks
-%patch6 -p1 -b .nosql
-#%patch7 -p1 -b .nostrip
-%patch8 -p1 -b .gethostbyname_r
-%patch9 -p1 -b .quiet-slaptest
-%patch10 -p1 -b .pthread
-%patch11 -p1 -b .smbk5pwd
+%patch1 -p1 -b .ldaprc
+%patch2 -p1 -b .setugid
+%patch3 -p1 -b .pie
+%patch4 -p1 -b .toollinks
+%patch5 -p1 -b .nosql
+%patch6 -p1 -b .gethostbyname_r
+%patch7 -p1 -b .quiet-slaptest
+%patch8 -p1 -b .pthread
+%patch9 -p1 -b .smbk5pwd
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd


--- openldap-1.2.11-cldap.patch DELETED ---


--- openldap-2.2.15-config.patch DELETED ---


--- openldap-2.3.11-ads.patch DELETED ---