rpms/openoffice.org/devel openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch, 1.4, 1.5 openoffice.org.spec, 1.480, 1.481 openoffice.org-1.9.127.gcc23691.slideshow.patch, 1.1, NONE openoffice.org-1.9.127.ooo54236.parallel.sysui.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Sep 20 11:45:42 UTC 2005 

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.127.gcc23691.slideshow.patch 
	openoffice.org-1.9.127.ooo54236.parallel.sysui.patch 
Log Message:
alternative fix

openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch:
 inc/target.mk        |    0 
 solenv/inc/target.mk |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch	8 Aug 2005 15:14:44 -0000	1.4
+++ openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch	20 Sep 2005 11:45:40 -0000	1.5
@@ -1,36 +1,22 @@
 Index: inc/target.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/target.mk,v
-retrieving revision 1.151
-diff -u -p -r1.151 target.mk
---- openoffice.org.orig/solenv/inc/target.mk	18 Mar 2005 10:13:41 -0000	1.151
-+++ openoffice.org/solenv/inc/target.mk	1 Apr 2005 09:41:31 -0000
-@@ -1745,7 +1745,7 @@ ALLTAR:	\
- .ELSE			# "$(L10N_framework)"!=""
- #		$(NOOPTTARGET) $(EXCEPTIONSTARGET)
- 
--ALLTAR: $(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
-+ALLTAR .SEQUENTIAL : $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR)	\
- 		$(COMPVERMK) \
- 		$(JAVAVERMK) \
- 		$(target_empty) \
-@@ -1908,15 +1908,15 @@ CPPUMAKERFLAGS*=-L
- MKDEPFLAGS+=-I:$(ENVINCPRE)
- .ENDIF			# "$(ENVINCPRE))"!=""
- .IF "$(OBJFILES)"!=""
--$(OBJFILES) : $(UNOUCRHEADER)
-+$(OBJFILES) .SEQUENTIAL : $(UNOUCRHEADER)
- .ENDIF			# "$(OBJFILES)"!=""
- .IF "$(SLOFILES)"!=""
--$(SLOFILES) : $(UNOUCRHEADER)
-+$(SLOFILES) .SEQUENTIAL : $(UNOUCRHEADER)
- .ENDIF			# "$(SLOFILES)"!=""
+retrieving revision 1.157
+diff -u -p -u -r1.157 target.mk
+--- openoffice.org.orig/solenv/inc/target.mk	8 Sep 2005 09:41:47 -0000	1.157
++++ openoffice.org/solenv/inc/target.mk	20 Sep 2005 10:58:54 -0000
+@@ -1874,12 +1874,13 @@ $(SLOFILES) : $(UNOUCRHEADER)
  .IF "$(DEPOBJFILES)"!=""
--$(DEPOBJFILES) : $(UNOUCRHEADER)
-+$(DEPOBJFILES) .SEQUENTIAL : $(UNOUCRHEADER)
+ $(DEPOBJFILES) : $(UNOUCRHEADER)
  .ENDIF			# "$(SLOFILES)"!=""
 -$(UNOUCRTARGET) : $(UNOUCRDEP)
-+$(UNOUCRTARGET) .SEQUENTIAL : $(UNOUCRDEP)
++CPPUMAKERTARGET : $(UNOUCRDEP)
  .IF "$(XML2MK_FILES)"!=""
  	@+-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)$/$(i).mk) >& $(NULLDEV)
  .ENDIF			# "$(XML2MK_FILES)"!=""
+ 	+$(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T")  $(UNOUCRRDB))
+ .ENDIF			# "$(SINGLE_SHOT)" == ""
++$(UNOUCRTARGET) : CPPUMAKERTARGET
+ .ENDIF			# "$(UNOTYPES)" != ""
+ 
+ .ENDIF			# "$(L10N_framework)"!=""


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- openoffice.org.spec	20 Sep 2005 07:50:55 -0000	1.480
+++ openoffice.org.spec	20 Sep 2005 11:45:40 -0000	1.481
@@ -1,5 +1,5 @@
 %define ooo2ver 130
-%define ooo_rpm_release 1.scratch
+%define ooo_rpm_release 1.scratch2
 %define build_fc5 1
 %define build_fc4 0
 %define build_rhel4 0
@@ -196,15 +196,13 @@
 Patch49: workspace.impress57.patch
 Patch50: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
 Patch51: workspace.gslpatches6.patch
-Patch52: openoffice.org-1.9.127.gcc23691.slideshow.patch
-Patch53: workspace.dmake43p01.patch
-Patch54: workspace.cmcfixes17.patch
-Patch55: openoffice.org-1.9.127.ooo54236.parallel.sysui.patch
-Patch56: workspace.emblock1.patch
-Patch57: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch58: workspace.cmcfixes18.patch
-Patch59: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch60: openoffice.org-1.9.130.ooo54708.sc.patch
+Patch52: workspace.dmake43p01.patch
+Patch53: workspace.cmcfixes17.patch
+Patch54: workspace.emblock1.patch
+Patch55: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch56: workspace.cmcfixes18.patch
+Patch57: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
+Patch58: openoffice.org-1.9.130.ooo54708.sc.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -864,17 +862,15 @@
 %patch49 -p1 -b .workspace.impress57.patch
 %patch50 -p1 -b .ooo54040.savecrash.svtools.patch
 %patch51 -p1 -b .workspace.gslpatches6.patch
-# %patch52 -p1 -b .gcc23691.slideshow.patch
-%patch53 -p1 -b .dmake43p01.patch
-%patch54 -p1 -b .workspace.cmcfixes17.patch
-# %patch55 -p1 -b .ooo54236.parallel.sysui.patch
-%patch56 -p1 -b .workspace.emblock1.patch
+%patch52 -p1 -b .dmake43p01.patch
+%patch53 -p1 -b .workspace.cmcfixes17.patch
+%patch54 -p1 -b .workspace.emblock1.patch
 %if ! %{internalicu}
-%patch57 -p1 -b .ooo54479.systemicu.patch
+%patch55 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch58 -p1 -b .workspace.cmcfixes18.patch
-%patch59 -p1 -b .ooo54692.fasterhelpcontent2.patch
-%patch60 -p1 -b .ooo54708.sc.patch
+%patch56 -p1 -b .workspace.cmcfixes18.patch
+%patch57 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch58 -p1 -b .ooo54708.sc.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3215,9 +3211,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Sep 19 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-1.scratch
+* Mon Sep 19 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-1.scratch2
 - add openoffice.org-1.9.130.ooo54708.sc.patch
 - workaround for gcc#22132# for rh#168537#
+- alternative parallel cppumaker problem fix
 
 * Thu Sep 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-1
 - next version


--- openoffice.org-1.9.127.gcc23691.slideshow.patch DELETED ---


--- openoffice.org-1.9.127.ooo54236.parallel.sysui.patch DELETED ---

More information about the fedora-cvs-commits mailing list