rpms/openoffice.org/devel openoffice.org-2.0.1.ooo58798.parallel.patch, NONE, 1.1 openoffice.org.spec, 1.571, 1.572

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23868

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.ooo58798.parallel.patch 
Log Message:
try an alternative for rawhide

openoffice.org-2.0.1.ooo58798.parallel.patch:
 inc/tg_jar.mk        |    0 
 solenv/inc/tg_jar.mk |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.1.ooo58798.parallel.patch ---
Index: inc/tg_jar.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
retrieving revision 1.17
diff -u -r1.17 tg_jar.mk
--- openoffice.org.orig/solenv/inc/tg_jar.mk	8 Sep 2005 09:44:35 -0000	1.17
+++ openoffice.org/solenv/inc/tg_jar.mk	2 Dec 2005 21:14:09 -0000
@@ -41,7 +41,7 @@
 .ENDIF
 
 .IF "$(NEW_JAR_PACK)"!=""
-$(JARTARGETN) : $(JARMANIFEST)
+$(JARTARGETN) : $(JARMANIFEST) $(JAVACLASSFILES)
 .ENDIF			# "$(NEW_JAR_PACK)"!=""
 
 .IF "$(NEW_JAR_PACK)"!=""


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- openoffice.org.spec	2 Dec 2005 10:34:55 -0000	1.571
+++ openoffice.org.spec	2 Dec 2005 20:54:22 -0000	1.572
@@ -1,6 +1,6 @@
 %define oootag SRC680
 %define ooomilestone 143
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 %define build_fc5 1
 %define build_fc4 0
@@ -193,6 +193,7 @@
 Patch40: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch41: openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch
 Patch42: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
+Patch43: openoffice.org-2.0.1.ooo58798.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -848,6 +849,7 @@
 %patch40 -p1 -b .ooo58606.sw.pre-edit.patch
 %patch41 -p1 -b .ooo58618.sfx2.interactionhandler.patch
 %patch42 -p1 -b .gcc25199.bitfieldaccess.patch
+%patch43 -p1 -b .ooo58798.parallel.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3299,6 +3301,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Dec 02 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-143.2
+- subtle build breakage
+
 * Fri Dec 02 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-143.1
 - 2.0.1 RC2
 
@@ -3369,7 +3374,7 @@
 - upstream patches as cmcfixes20
 - rh#171844# make another stab at the klipper problem
 - ooo#57107# updated hindi translation
-- rh#159381# be less of a gcj bigot
+- rh#171692# be less of a gcj bigot
 - rh#172149# need more stuff in the classpath for macro creating
 
 * Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.6