rpms/openoffice.org/devel openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch, NONE, 1.1 openoffice.org.spec, 1.540, 1.541

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15453

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch 
Log Message:
workaround deprecated openldap api

openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch:
 extensions/source/config/ldap/makefile.mk |    2 +-
 source/config/ldap/makefile.mk            |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch ---
Index: source/config/ldap/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
retrieving revision 1.9
diff -u -p -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/config/ldap/makefile.mk	8 Sep 2005 19:25:01 -0000	1.9
+++ openoffice.org/extensions/source/config/ldap/makefile.mk	13 Nov 2005 19:58:12 -0000
@@ -63,7 +63,7 @@ LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozi
 .ENDIF
 
 .IF "$(WITH_OPENLDAP)" == "YES"
-CFLAGS += -DWITH_OPENLDAP
+CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED
 .ENDIF
 
 SOLARINC+= $(LDAPSDKINCLUDES)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -r1.540 -r1.541
--- openoffice.org.spec	11 Nov 2005 14:33:22 -0000	1.540
+++ openoffice.org.spec	13 Nov 2005 20:01:36 -0000	1.541
@@ -194,6 +194,7 @@
 Patch40: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
 Patch41: workspace.systemlibxmlfix.patch
 Patch42: workspace.jaxpapi.patch
+Patch43: openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -849,6 +850,7 @@
 %patch40 -p1 -b .ooo56536.sw.rtfcrash.patch
 %patch41 -p1 -b .workspace.systemlibxmlfix.patch
 # %patch42 -p1 -b .workspace.jaxpapi.patch
+%patch43 -p1 -b .oooXXXXX.extensions.openldapapi.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3234,6 +3236,7 @@
 	+ drop openoffice.org-1.9.84.ooo44843.sdcasting.patch
 	+ drop openoffice.org-1.9.84.ooo44846.svxcasting.patch
 	+ drop openoffice.org-1.9.84.ooo45162.svxcasting2.patch
+- workaround deprecated openldap api usage
 
 * Wed Nov 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.3
 - fix problem with icu rule searching with null locale