rpms/openoffice.org/devel openoffice.org.spec, 1.637, 1.638 openoffice.org-1.9.114.ooo51718.rpath.patch, 1.2, NONE openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 13 11:48:16 UTC 2006 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.114.ooo51718.rpath.patch 
	openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch 
Log Message:
drop integrated patches


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- openoffice.org.spec	13 Mar 2006 10:20:45 -0000	1.637
+++ openoffice.org.spec	13 Mar 2006 11:48:14 -0000	1.638
@@ -184,28 +184,26 @@
 Patch14: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
 Patch15: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
 Patch16: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch17: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch19: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch20: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch21: workspace.dmake43p01.patch
-Patch22: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch23: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch24: workspace.atkbridge.patch
-Patch25: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch26: workspace.jaxpapi.patch
-Patch27: workspace.systemjava.patch
-Patch28: workspace.targetedaot.patch
-Patch29: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch30: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch31: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch32: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-Patch33: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch34: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch35: openoffice.org-2.0.2.ooo61875.sd.compile.patch
-Patch36: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
-Patch37: openoffice.org-2.0.2.ooo62030.solenv._version.patch
-Patch38: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
+Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch18: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch19: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch20: workspace.dmake43p01.patch
+Patch21: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch22: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch23: workspace.atkbridge.patch
+Patch24: workspace.jaxpapi.patch
+Patch25: workspace.systemjava.patch
+Patch26: workspace.targetedaot.patch
+Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch29: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
+Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -840,34 +838,31 @@
 %patch15 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
 %patch16 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%else
-%patch17 -p1 -b .ooo51718.rpath.patch
 %endif
-%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch19 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch20 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch21 -p1 -b .dmake43p01.patch
+%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch18 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch19 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch20 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch22 -p1 -b .ooo54479.systemicu.patch
+%patch21 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch23 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch24 -p0 -b .workspace.atkbridge.patch
-%patch25 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch26 -p0 -b .workspace.jaxpapi.patch
-%patch27 -p1 -b .workspace.systemjava.patch
-%patch28 -p1 -b .workspace.targetedaot.patch
-%patch29 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch30 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch22 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch23 -p0 -b .workspace.atkbridge.patch
+%patch24 -p0 -b .workspace.jaxpapi.patch
+%patch25 -p1 -b .workspace.systemjava.patch
+%patch26 -p1 -b .workspace.targetedaot.patch
+%patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch28 -p1 -b .ooo58606.sw.pre-edit.patch
 %if %{build_fc4}
-%patch31 -p1 -b .gcc25199.bitfieldaccess.patch
+%patch29 -p1 -b .gcc25199.bitfieldaccess.patch
 %endif
-%patch32 -p1 -b .ooo59675.sysui.rtfmimetype.patch
-%patch33 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch34 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch35 -p1 -b .ooo61875.sd.compile.patch
-%patch36 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
-%patch37 -p1 -b .ooo62030.solenv._version.patch
-%patch38 -p1 -b .oooXXXXX.config_office.noppds.patch
+%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch33 -p1 -b .ooo61875.sd.compile.patch
+%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch35 -p1 -b .ooo62030.solenv._version.patch
+%patch36 -p1 -b .oooXXXXX.config_office.noppds.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -921,11 +916,11 @@
 export nodep=true
 export NO_HIDS=true
 #enable parallel build
-#export MAXPROCESS=$RPM_BUILD_NCPUS
-#dmake has limit of 10 processes apparently
-#if [ $MAXPROCESS -gt 10 ]; then
-#	export MAXPROCESS=10
-#fi
+export MAXPROCESS=$RPM_BUILD_NCPUS
+dmake has limit of 10 processes apparently
+if [ $MAXPROCESS -gt 10 ]; then
+	export MAXPROCESS=10
+fi
 #we'll build with at least build -P2 so we can do something useful while
 #helpcontent2 is wasting our time
 export MAXBUILDS=$[RPM_BUILD_NCPUS*2]
@@ -3355,6 +3350,8 @@
 * Mon Mar 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.3
 - rh#183457# have the greek langpack depend on fonts-chinese
 - ooo#59997# replacement opens___.ttf updated
+- drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+- drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch
 
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 1:2.0.2-5.2
 - rebuild for PPC TLS issue (#184446)


--- openoffice.org-1.9.114.ooo51718.rpath.patch DELETED ---


--- openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch DELETED ---

More information about the fedora-cvs-commits mailing list