Hello community,
here is the log from the commit of package OpenOffice_org-bootstrap for openSUSE:11.1
checked in at Thu Dec 4 12:13:23 CET 2008.
--------
--- old-versions/11.1/all/OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2008-11-28 11:42:54.000000000 +0100
+++ /mounts/work_src_done/11.1/OpenOffice_org-bootstrap/OpenOffice_org-bootstrap.changes 2008-12-03 20:59:25.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 3 20:55:43 CET 2008 - pmladek@suse.cz
+
+- added java independent fix of the rhino-related problems to fix build
+ on openSUSE-11.1-ppc (bnc#449711)
+
+-------------------------------------------------------------------
calling whatdependson for 11.1-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.Wi2267/_old 2008-12-04 12:09:58.000000000 +0100
+++ /var/tmp/diff_new_pack.Wi2267/_new 2008-12-04 12:09:58.000000000 +0100
@@ -115,7 +115,7 @@
License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
Group: Productivity/Office/Suite
Version: 3.0.0.9
-Release: 3
+Release: 4
AutoReqProv: on
Summary: OpenOffice.org Build Bootstrap
Url: http://www.openoffice.org/
@@ -139,9 +139,7 @@
Patch2: ooo-build-3.0.0.9-prune-duplicities.diff
Patch3: ooo-build-3.0.0.9-external.diff
Patch4: ooo-build-3.0.0.9-pyuno-python-2.6-uno-import.diff
-%ifarch ppc
-Patch100: ooo-build-3.0.0.9-buildfix-openjdk-6-no-rhino.diff
-%endif
+Patch5: ooo-build-3.0.0.9-buildfix-openjdk-6-no-rhino.diff
#
# patches against the upstream sources, must be -p0
# Patch1000: bug-123456-fix-foo.diff # example
@@ -170,9 +168,7 @@
%patch2
%patch3
%patch4
-%ifarch ppc
-%patch100
-%endif
+%patch5
%endif
chmod 755 bin/piece/file-list-libs_extern
@@ -314,6 +310,9 @@
%ooo_prefix/%ooo_home/ooo-build/*
%changelog
+* Wed Dec 03 2008 pmladek@suse.cz
+- added java independent fix of the rhino-related problems to fix build
+ on openSUSE-11.1-ppc (bnc#449711)
* Thu Nov 27 2008 pmladek@suse.cz
- removed duplicated basis3.0/ure-link and solver/bin/userland.txt to avoid
conflicts between OOo packages
++++++ ooo-build-3.0.0.9-buildfix-openjdk-6-no-rhino.diff ++++++
--- /var/tmp/diff_new_pack.Wi2267/_old 2008-12-04 12:09:59.000000000 +0100
+++ /var/tmp/diff_new_pack.Wi2267/_new 2008-12-04 12:09:59.000000000 +0100
@@ -1,11 +1,89 @@
---- patches/dev300/apply
-+++ patches/dev300/apply
-@@ -2895,7 +2895,7 @@
- crash-gvfs.diff, i#95689, michael
-
- # openjdk contains rhino.jar. breaks the build...
--buildfix-openjdk-6-no-rhino.diff
-+#buildfix-openjdk-6-no-rhino.diff
-
- # fix problem with calling private and protected members in layout code
- sfx2-privateprotectedpublic.diff
+--- patches/dev300/buildfix-openjdk-6-no-rhino.diff.old 2008-09-24 21:35:03.000000000 +0200
++++ patches/dev300/buildfix-openjdk-6-no-rhino.diff 2008-12-03 20:24:22.000000000 +0100
+@@ -1,41 +1,62 @@
+-? unxlngx6.pro
+-Index: rhino1_5R5.patch
+-===================================================================
+-RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
+-retrieving revision 1.3
+-diff -u -r1.3 rhino1_5R5.patch
+---- rhino/rhino1_5R5.patch 11 Apr 2008 07:03:06 -0000 1.3
+-+++ rhino/rhino1_5R5.patch 12 Aug 2008 20:08:16 -0000
+-@@ -1174,3 +1174,14 @@
++--- rhino/rhino1_5R5.patch.old 2008-12-03 20:22:39.000000000 +0100
+++++ rhino/rhino1_5R5.patch 2008-12-03 20:22:30.000000000 +0100
++@@ -1174,3 +1174,30 @@
+ PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
+ return new ProtectionDomain(cs, pc);
+ }
+-+--- misc/rhino1_5R5/toolsrc/build.xml 2004-03-25 17:54:34.000000000 -0300
+-++++ misc/build/rhino1_5R5/toolsrc/build.xml 2008-08-12 16:58:52.000000000 -0
+-+va Fri Mar 28 17:24:23 2008
+-+@@ -68,6 +32,7 @@
+++--- misc/rhino1_5R5/toolsrc/build.xml 2008-12-03 20:20:21.000000000 +0100
++++++ misc/build/rhino1_5R5/toolsrc/build.xml 2008-12-03 20:19:28.000000000 +0100
+++@@ -6,6 +6,16 @@ Requires Ant version 1.2
+++ -->
+++ <project name="toolsrc" default="compile" basedir=".">
+++
++++ <!-- rhino.jar from OpenJDK breaks build -->
++++ <path id="my.bootstrap.classpath">
++++ <fileset dir="${java.home}/">
++++ <include name="jre/lib/*.jar"/>
++++ <include name="lib/*.jar"/>
++++ <exclude name="jre/lib/rhino.jar"/>
++++ <exclude name="lib/rhino.jar"/>
++++ </fileset>
++++ </path>
++++
+++ <target name="properties">
+++ <property name="nest" value=".."/>
+++ <property name="build.dir" value="./build"/>
+++@@ -32,6 +42,7 @@ Requires Ant version 1.2
+ + includes="org/**/*.java"
+ + deprecation="on"
+ + debug="${debug}">
+-++ <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++++ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
+ + </javac>
+ + <copy todir="${nest}/${classes}">
+ + <fileset dir="." includes="org/**/*.properties" />
+-? unxlngx6.pro
+-Index: java/build.xml
+-===================================================================
+-RCS file: /cvs/framework/scripting/java/build.xml,v
+-retrieving revision 1.36
+-diff -u -r1.36 build.xml
+---- scripting/java/build.xml 11 Apr 2008 09:46:13 -0000 1.36
+-+++ scripting/java/build.xml 12 Aug 2008 23:20:31 -0000
+-@@ -85,7 +85,9 @@
++--- scripting/java/build.xml.old.orig 2008-12-03 20:08:19.000000000 +0100
+++++ scripting/java/build.xml 2008-12-03 20:12:57.000000000 +0100
++@@ -85,6 +85,16 @@
++ <pathelement path="${jardir}"/>
++ <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/>
++ </path>
+++
+++ <!-- rhino.jar from OpenJDK breaks build -->
+++ <path id="my.bootstrap.classpath">
+++ <fileset dir="${java.home}/">
+++ <include name="jre/lib/*.jar"/>
+++ <include name="lib/*.jar"/>
+++ <exclude name="jre/lib/rhino.jar"/>
+++ <exclude name="lib/rhino.jar"/>
+++ </fileset>
+++ </path>
++
++ <!-- ===================== Prepare Directories ========================= -->
++ <target name="prepare">
++@@ -95,7 +105,9 @@
+ <target name="compile" depends="prepare">
+