rpms/openoffice.org/FC-4 openoffice.org.spec, 1.224, 1.225 sources, 1.84, 1.85

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Log Message:
foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- openoffice.org.spec	30 Nov 2005 08:43:20 -0000	1.224
+++ openoffice.org.spec	30 Nov 2005 09:39:20 -0000	1.225
@@ -172,22 +172,22 @@
 Patch20: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
 Patch21: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
 Patch22: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch23: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch24: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch25: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
-Patch26: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch27: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch28: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
-Patch29: workspace.dmake43p01.patch
-Patch30: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch31: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch32: workspace.atkbridge.patch
-Patch33: workspace.cmcfixes20.patch
-Patch34: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch35: workspace.jaxpapi.patch
-Patch36: workspace.cmcfixes22.patch
-Patch37: workspace.cmcfixes23.patch
-Patch38: openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
+Patch23: openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
+Patch24: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch25: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch26: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
+Patch27: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch28: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch29: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
+Patch30: workspace.dmake43p01.patch
+Patch31: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch32: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch33: workspace.atkbridge.patch
+Patch34: workspace.cmcfixes20.patch
+Patch35: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+Patch36: workspace.jaxpapi.patch
+Patch37: workspace.cmcfixes22.patch
+Patch38: workspace.cmcfixes23.patch
 Patch39: openoffice.org-2.0.1.oooXXXXX.vcl.missingglyph.patch
 Patch40: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch41: openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch
@@ -822,26 +822,26 @@
 %patch20 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
 %patch21 -p1 -b .ooo54692.fasterhelpcontent2.patch
 %patch22 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch23 -p1 -b .oooXXXXX.systemxalan.patch
 %else
-%patch23 -p1 -b .ooo51718.rpath.patch
+%patch24 -p1 -b .ooo51718.rpath.patch
 %endif
-%patch24 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch25 -p1 -b .ooo54586.nfslock.sal.patch
-%patch26 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch27 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch28 -p1 -b .ooo54040.savecrash.svtools.patch
-%patch29 -p1 -b .dmake43p01.patch
+%patch25 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch26 -p1 -b .ooo54586.nfslock.sal.patch
+%patch27 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch28 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch29 -p1 -b .ooo54040.savecrash.svtools.patch
+%patch30 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch30 -p1 -b .ooo54479.systemicu.patch
+%patch31 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch31 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch32 -p1 -b .workspace.atkbridge.patch
-%patch33 -p1 -b .workspace.cmcfixes20.patch
-%patch34 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch35 -p1 -b .workspace.jaxpapi.patch
-%patch36 -p1 -b .workspace.cmcfixes22.patch
-%patch37 -p1 -b .workspace.cmcfixes23.patch
-%patch38 -p1 -b .oooXXXXX.systemxalan.patch
+%patch32 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch33 -p1 -b .workspace.atkbridge.patch
+%patch34 -p1 -b .workspace.cmcfixes20.patch
+%patch35 -p1 -b .ooo56651.sw.rtfcrash.patch
+%patch36 -p1 -b .workspace.jaxpapi.patch
+%patch37 -p1 -b .workspace.cmcfixes22.patch
+%patch38 -p1 -b .workspace.cmcfixes23.patch
 %patch39 -p1 -b .oooXXXXX.vcl.missingglyph.patch
 %patch40 -p1 -b .ooo58606.sw.pre-edit.patch
 %patch41 -p1 -R -b .ooo58618.sfx2.interactionhandler.patch
@@ -925,15 +925,6 @@
 done
 export ARCH_FLAGS=`echo $ARCH_FLAGS | sed -e "s/-mtune=pentium4/-mtune=pentiumpro/"` # rh#171873#
 
-%if %{build_fc4}
-# gcc#19870# gcj access problems, monsterous hack to force all java through
-# a sed script which replaces private and protected with public, shudder!
-cp %{SOURCE5} solenv/bin/gcj
-chmod u+x solenv/bin/gcj
-export TRUEJAVACOMPILER=$JAVACOMPILER
-export JAVACOMPILER=`pwd`/solenv/bin/gcj
-%endif
-
 rm -rf external/common/jaxp.jar external/common/parser.jar
 
 %if ! %{internaljavabits}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	30 Nov 2005 08:43:20 -0000	1.84
+++ sources	30 Nov 2005 09:39:20 -0000	1.85
@@ -3,7 +3,6 @@
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
 f2fc336c9bd7672a13e58d39bbb4553f  GSI_ga.sdf
-1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 27071256f362853388826f79580ce5c5  SRC680_m140.tar.bz2
 2cd37ed5f2ac9fa129f6aaaa3491988f  openoffice.org-myspell-contrib.tar.gz
 fb8090f7c9e6fe02a8035d71bf625ccd  SRC680_m142.tar.bz2