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

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo88815.oox.parallel.patch 
Removed Files:
	openoffice.org-3.0.0.ooo89921.oox.parallel.patch 
Log Message:
change to upstream id

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

--- NEW FILE openoffice.org-3.0.0.ooo88815.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,14 @@
 
 .INCLUDE :  target.mk
 
-$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
-		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf
+$(MISC)$/tokens.gperf $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx : 
+	@@noop $(assign do_phony:=.PHONY)
 
-$(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf
-		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.inc
+$(MISC)$/do_tokens $(do_phony) : tokens.txt gentoken.pl $(MISC)$/tokens.gperf $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
+		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf && $(TOUCH) $@
 
-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
+$(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf $(MISC)$/do_tokens
+		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokens.inc
+
+$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx $(MISC)$/do_tokens
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1511
retrieving revision 1.1512
diff -u -r1.1511 -r1.1512
--- openoffice.org.spec	25 May 2008 10:10:49 -0000	1.1511
+++ openoffice.org.spec	26 May 2008 11:31:02 -0000	1.1512
@@ -126,7 +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
+Patch55: openoffice.org-3.0.0.ooo88815.oox.parallel.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1245,7 +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
+%patch55 -p1 -b .ooo88815.oox.parallel.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


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