rpms/openoffice.org/F-9 openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch, NONE, 1.1 openoffice.org.spec, 1.1468, 1.1469

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue Apr 15 16:18:14 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch 
Log Message:
add openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch

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

--- NEW FILE openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch ---
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.168.4.1
diff -u -r1.168.4.1 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	23 Jan 2008 17:07:28 -0000	1.168.4.1
+++ openoffice.org/config_office/set_soenv.in	15 Apr 2008 16:14:24 -0000
@@ -462,11 +462,10 @@
          $OUTPATH = "unxlngppc64";
          $CPUNAME = "POWERPC64";
 
-         if ( $JDK eq "gcj" ) {
-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-         }
+         $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
+         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."xawt";
       }
       else {
          print "Setting Linux PPC specific values... ";
@@ -474,26 +473,22 @@
          $OUTPATH = "unxlngppc";
          $CPUNAME = "POWERPC";
 
-         if ( $JDK eq "gcj" ) {
-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
-         elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
-         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."bin";
+         if ($JDK =~ m/^[Ii][Bb][Mm]/) {  
+# the "standard" ppc j2sdk is IBMJava2-ppc-142
+            $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."bin";
             $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
             $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin";
             $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."xawt";
          }
+         else {
+            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+         } 
       }
 
       $CPU            = "P";
-
-# the "standard" ppc j2sdk is IBMJava2-ppc-142
-      if ( $JDK ne "gcj" ) {
-          $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
-          $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-          $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
-      }
    }
    elsif ($platform =~ m/^s390/)
    {  print "Setting Linux S/390 specific values... ";


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1468
retrieving revision 1.1469
diff -u -r1.1468 -r1.1469
--- openoffice.org.spec	15 Apr 2008 14:22:49 -0000	1.1468
+++ openoffice.org.spec	15 Apr 2008 16:17:29 -0000	1.1469
@@ -151,6 +151,7 @@
 Patch78: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 Patch79: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
 Patch80: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
+Patch81: openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1116,6 +1117,7 @@
 %patch78 -p1 -b .ooo85691.vcl.tooltipcolor.patch
 %patch79 -p1 -b .ooo87991.fpickersafe.patch
 %patch80 -p1 -b .ooo88033.svx.a11ycrash.patch
+%patch81 -p1 -b .oooXXXXX.config_office.ppc.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2900,11 +2902,12 @@
 
 
 %changelog
-* Tue Apr 08 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
+* Tue Apr 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
 - Resolves: rhbz#439727 find another crasher
 - Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 - Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch
 - Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
+- add openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch to try and build
 
 * Wed Apr 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.5
 - Resolves: rhbz#439727 find crasher




More information about the fedora-extras-commits mailing list