rpms/openoffice.org/F-9 openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch, 1.3, 1.4

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27467

Modified Files:
	openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch 
Log Message:
chickens back to roost

openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch:

Index: openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch	15 Apr 2008 19:18:46 -0000	1.3
+++ openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch	16 Apr 2008 07:13:22 -0000	1.4
@@ -74,3 +74,29 @@
  #endif
  
      };
+Index: inc/libs.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/libs.mk,v
+retrieving revision 1.123
+diff -u -r1.123 libs.mk
+--- openoffice.org.orig/solenv/inc/libs.mk	12 Dec 2007 13:15:14 -0000	1.123
++++ openoffice.org/solenv/inc/libs.mk	16 Apr 2008 07:12:10 -0000
+@@ -210,18 +210,7 @@
+ ZLIB3RDLIB=-lzlib
+ .ENDIF
+ .IF "$(SYSTEM_JPEG)"=="YES"
+-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+-#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
+-.IF "$(OS)" == "FREEBSD"
+-JPEG3RDLIB=/usr/local/lib/libjpeg.so
+-.ELIF "$(CPUNAME)" == "X86_64"
+-JPEG3RDLIB=/usr/lib64/libjpeg.so
+-.ELSE
+-JPEG3RDLIB=/usr/lib/libjpeg.so
+-.ENDIF
+-.ELSE
+ JPEG3RDLIB=-ljpeg
+-.ENDIF
+ .ELSE
+ JPEG3RDLIB=-ljpeglib
+ .ENDIF