rpms/openoffice.org/devel openoffice.org-3.0.0.ooo89921.oox.parallel.patch, NONE, 1.1 openoffice.org.spec, 1.1510, 1.1511

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16655

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo89921.oox.parallel.patch 
Log Message:
make parallel build safe

openoffice.org-3.0.0.ooo89921.oox.parallel.patch:

--- NEW FILE openoffice.org-3.0.0.ooo89921.oox.parallel.patch ---
Index: source/token/makefile.mk
===================================================================
RCS file: /cvs/xml/oox/source/token/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- openoffice.org.orig/oox/source/token/makefile.mk	18 Apr 2008 14:33:38 -0000	1.7
+++ openoffice.org/oox/source/token/makefile.mk	25 May 2008 10:07:00 -0000
@@ -50,11 +50,11 @@
 
 .INCLUDE :  target.mk
 
-$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
+$(MISC)$/tokens.gperf : tokens.txt gentoken.pl
 		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf
 
 $(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf
 		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.inc
 
-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
+$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1510
retrieving revision 1.1511
diff -u -r1.1510 -r1.1511
--- openoffice.org.spec	24 May 2008 15:55:56 -0000	1.1510
+++ openoffice.org.spec	25 May 2008 10:10:49 -0000	1.1511
@@ -126,6 +126,7 @@
 Patch52: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
 Patch53: openoffice.org-3.0.0.ooo89172.filter.string.patch
 Patch54: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch55: openoffice.org-3.0.0.ooo89921.oox.parallel.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1244,6 +1245,7 @@
 %patch52 -p1 -b .ooo89002.vcl.symbolfonts.patch
 %patch53 -p1 -b .ooo89172.filter.string.patch
 %patch54 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch55 -p1 -b .ooo89921.oox.parallel.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3368,6 +3370,7 @@
 - Require new hunspell-ml for Malayalam langpack
 - drop integrated openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 - drop integrated openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+- add openoffice.org-3.0.0.ooo89921.oox.parallel.patch
 
 * Mon May 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-1
 - next version