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

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch 
Log Message:
damnable ppc64

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch	16 Apr 2008 07:13:22 -0000	1.4
+++ openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch	16 Apr 2008 08:00:40 -0000	1.5
@@ -81,22 +81,12 @@
 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
+@@ -216,6 +216,8 @@
+ JPEG3RDLIB=/usr/local/lib/libjpeg.so
+ .ELIF "$(CPUNAME)" == "X86_64"
+ JPEG3RDLIB=/usr/lib64/libjpeg.so
++.ELIF "$(CPUNAME)" == "POWERPC64"
++JPEG3RDLIB=/usr/lib64/libjpeg.so
  .ELSE
- JPEG3RDLIB=-ljpeglib
+ JPEG3RDLIB=/usr/lib/libjpeg.so
  .ENDIF