rpms/openoffice.org/devel openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch, NONE, 1.1 openoffice.org.spec, 1.1931, 1.1932

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3478

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch 
Log Message:
add openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch buildfix

openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch:

--- NEW FILE openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch ---
--- sdext.orig/source/pdfimport/xpdfwrapper/pnghelper.cxx	2009-06-11 18:24:02.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx	2009-06-11 18:24:13.000000000 +0100
@@ -30,7 +30,11 @@
 
 #include "pnghelper.hxx"
 
-#include "zlib/zlib.h"
+#ifdef SYSTEM_ZLIB
+#include "zlib.h"
+#else
+#include <zlib/zlib.h>
+#endif
 
 using namespace pdfi;
 
--- sdext.orig/source/pdfimport/xpdfwrapper/makefile.mk	2009-06-11 18:24:29.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	2009-06-11 18:24:46.000000000 +0100
@@ -41,6 +41,10 @@
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEM_ZLIB)" == "YES"
+CFLAGS+=-DSYSTEM_ZLIB
+.ENDIF
+
 .IF "$(ENABLE_PDFIMPORT)" == "NO"
 @all:
 	@echo "PDF Import extension disabled."


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1931
retrieving revision 1.1932
diff -u -p -r1.1931 -r1.1932
--- openoffice.org.spec	11 Jun 2009 12:52:10 -0000	1.1931
+++ openoffice.org.spec	11 Jun 2009 17:30:00 -0000	1.1932
@@ -149,6 +149,7 @@ Patch71: openoffice.org-3.1.0.ooo102490.
 Patch72: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
 Patch73: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
 Patch74: workspace.calc51.patch
+Patch75: openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1655,6 +1656,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch72 -p0 -b .ooo102061.sc.cellanchoring.patch
 %patch73 -p0 -b .ooo102142.sd.resleak.patch
 %patch74 -p0 -b .workspace.calc51.patch
+%patch75 -p0 -b .ooo102679.sdext.buildfix.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`