rpms/openoffice.org/devel openoffice.org-3.2.0.ooo101158.fixxmlhelpparallel.patch, NONE, 1.1 openoffice.org.spec, 1.2070, 1.2071

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12277

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo101158.fixxmlhelpparallel.patch 
Log Message:
Resolves: ooo#101158 parallel build breakage in xmlhelp (caolanm)

openoffice.org-3.2.0.ooo101158.fixxmlhelpparallel.patch:
 makefile.mk |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo101158.fixxmlhelpparallel.patch ---
--- xmlhelp/source/com/sun/star/help/makefile.mk	2009-11-13 10:53:15.000000000 +0000
+++ xmlhelp/source/com/sun/star/help/makefile.mk	2009-11-13 10:54:59.000000000 +0000
@@ -58,8 +58,6 @@
 
 
 JAVACLASSFILES = \
-	$(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpIndexerTool.class			\
-	$(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpFileDocument.class		\
 	$(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class			        \
 	$(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class			        \
 	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class			        
@@ -75,9 +73,7 @@
 
 ADDFILES = $(subst,$(SOLARBINDIR)$/help,$(CLASSDIR) $(TRANSEX3FILES))
 
-#JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar HelpIndexerTool.jar
+JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar 
 .IF "$(SYSTEM_LUCENE)" == "YES"
 XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
 COMP=fix_system_lucene
@@ -96,6 +92,7 @@
 ALLTAR : $(ADDFILES)
 
 .IF "$(JARTARGETN)"!=""
+$(JAVATARGET) : $(ADDFILES)
 $(JARTARGETN) : $(ADDFILES)
 $(JARTARGETN) : $(COMP)
 .ENDIF
@@ -105,7 +102,7 @@
 	$(COPY) $< $@
 
 
-fix_system_lucene:
+fix_system_lucene: $(JARMANIFEST)
 	@echo "Fix Java Class-Path entry for Lucene libraries from system."
 	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
+	-i $<


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2070
retrieving revision 1.2071
diff -u -p -r1.2070 -r1.2071
--- openoffice.org.spec	12 Nov 2009 20:00:40 -0000	1.2070
+++ openoffice.org.spec	13 Nov 2009 10:57:46 -0000	1.2071
@@ -128,6 +128,7 @@ Patch50: openoffice.org-3.2.0.ooo106497.
 Patch51: openoffice.org-3.2.0.ooo106523.icc.fixendianandtypes.patch
 Patch52: openoffice.org-3.1.1.ooo105710.svx.loadstorenumbering.patch
 Patch53: openoffice.org-3.2.0.ooo59648.sw.scaling.patch
+Patch54: openoffice.org-3.2.0.ooo101158.fixxmlhelpparallel.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1649,6 +1650,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch51 -p1 -b .ooo106523.icc.fixendianandtypes.patch
 %patch52 -p1 -b .ooo105710.svx.loadstorenumbering.patch
 %patch53 -p1 -b .ooo59648.sw.scaling.patch
+%patch54 -p0 -b .ooo101158.fixxmlhelpparallel.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4157,9 +4159,10 @@ fi
 %endif
 
 %changelog
-* Thu Nov 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-4.3
+* Fri Nov 13 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-4.3
 - add openoffice.org-3.2.0.ooo59648.sw.scaling.patch (caolanm)
 - Resolves: rhbz#537166 add a version require on hyphen (caolanm)
+- Resolves: ooo#101158 parallel build breakage in xmlhelp (caolanm)
 
 * Tue Nov 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-4.2
 - Resolves: rhbz#533841 ooo#105710 svx loadstorenumbering (caolanm)