rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch, NONE, 1.1 openoffice.org.spec, 1.1903, 1.1904

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21565/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch 
Log Message:
just in case of picking up wrong evo connector

openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch ---
--- connectivity.orig/source/drivers/evoab/makefile.mk	2008-12-30 15:32:01.000000000 +0100
+++ connectivity/source/drivers/evoab/makefile.mk	2009-04-29 20:51:57.000000000 +0200
@@ -36,6 +36,11 @@ TARGET=evoab
 
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(ENABLE_EVOAB2)"=="TRUE"
+dummy:
+	@echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
+.ELSE
+
 # --- Settings ----------------------------------
 .IF "$(DBGUTIL_OJ)"!=""
 ENVCFLAGS+=/FR$(SLO)$/
@@ -103,6 +108,7 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
 .ENDIF
+.ENDIF
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1903
retrieving revision 1.1904
diff -u -p -r1.1903 -r1.1904
--- openoffice.org.spec	28 Apr 2009 09:34:27 -0000	1.1903
+++ openoffice.org.spec	29 Apr 2009 20:32:44 -0000	1.1904
@@ -7,7 +7,7 @@
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
-#%define gtkprintui 1
+%define gtkprintui 0
 # whether to use stlport or gcc's stl, we're basically locked to stlport
 # for i386 to enable third party built against "vanilla OOo" uno components 
 # and add-ons to work with our OOo. We assume there aren't any such for the
@@ -137,6 +137,7 @@ Patch61: openoffice.org-3.1.0.ooo101274.
 Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2099,9 +2101,6 @@ tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{
 #remove it in case we didn't build with gcj
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/classes/sandbox.jar
 
-#remove evolution 1 address book driver
-rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/libevoab1.so
-
 #remove pagein stuff
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/pagein*