rpms/openoffice.org/devel openoffice.org.spec, 1.1400, 1.1401 openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch, 1.1, NONE openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch, 1.4, NONE workspace.impress132.patch, 1.1, NONE workspace.sw8u10bf04.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-serv6107

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch 
	openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch 
	workspace.impress132.patch workspace.sw8u10bf04.patch 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1400
retrieving revision 1.1401
diff -u -r1.1400 -r1.1401
--- openoffice.org.spec	21 Jan 2008 20:01:11 -0000	1.1400
+++ openoffice.org.spec	22 Jan 2008 15:29:47 -0000	1.1401
@@ -1,6 +1,6 @@
 %define oootag OOH680
-%define ooomilestone 3
-%define rh_rpm_release 3
+%define ooomilestone 4
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -123,27 +123,23 @@
 Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch52: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
-Patch53: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch54: workspace.notes2.patch
-Patch55: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch56: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch57: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch58: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
-Patch59: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch60: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
-Patch61: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
-Patch62: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch63: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch64: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch65: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
-Patch66: workspace.sw8u10bf04.patch
-Patch67: workspace.impress132.patch
-Patch68: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-Patch69: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
-Patch70: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch71: workspace.sw24bf02.patch
-Patch72: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch53: workspace.notes2.patch
+Patch54: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch57: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
+Patch58: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch59: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+Patch60: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
+Patch61: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch62: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch63: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch64: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
+Patch65: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
+Patch66: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch67: workspace.sw24bf02.patch
+Patch68: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1081,27 +1077,23 @@
 %patch49 -p1 -b .ooo76649.httpencoding.patc
 %patch50 -p1 -b .ooo82966.svx.missing3d.patch
 %patch51 -p1 -b .ooo81307.sw.word2.patch
-%patch52 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
-%patch53 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch54 -p1 -b .workspace.notes2.patch
-%patch55 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch56 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch57 -p1 -b .ooo84770.svx.eventsmismatch.patch
-%patch58 -p1 -b .ooo84684.vcl.fixfontconfig.patch
-%patch59 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch60 -p1 -b .oo85055.psprint.linetoolong.patch
-%patch61 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
-%patch62 -p1 -b .ooo85097.desktop.pagein.patch
-%patch63 -p1
-%patch64 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch65 -p1 -b .ooo83410.solenv.renameserbian.patch
-%patch66 -p1 -b .workspace.sw8u10bf04.patch
-%patch67 -p1 -b .workspace.impress132.patch
-%patch68 -p1 -b .ooo85385.svtools.a11ycrash.patch
-%patch69 -p1 -b .ooo85321.vcl.pixmapleak.patch
-%patch70 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch71 -p1 -b .workspace.sw24bf02.patch
-%patch72 -p1 -b .ooo85448.emptyrpath.patch
+%patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch53 -p1 -b .workspace.notes2.patch
+%patch54 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch55 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch57 -p1 -b .ooo84684.vcl.fixfontconfig.patch
+%patch58 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch59 -p1 -b .oo85055.psprint.linetoolong.patch
+%patch60 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
+%patch61 -p1 -b .ooo85097.desktop.pagein.patch
+%patch62 -p1
+%patch63 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch64 -p1 -b .ooo85385.svtools.a11ycrash.patch
+%patch65 -p1 -b .ooo85321.vcl.pixmapleak.patch
+%patch66 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch67 -p1 -b .workspace.sw24bf02.patch
+%patch68 -p1 -b .ooo85448.emptyrpath.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1163,12 +1155,6 @@
 fi
 deliver -link
 localize -m -x -l bn -f %{SOURCE5}
-
-# ooo#83410 serbian is still called sr-CS, rename translations to sr
-localize -e -l sr-CS -f ../../sr-CS.sdf
-sed -i -e "s/\tsr-CS\t/\tsr\t/" ../../sr-CS.sdf
-localize -m -x -l sr -f ../../sr-CS.sdf
-
 cd ../..
 
 #build OOo, on failure make a stab at debugging the crash if any, and
@@ -2873,6 +2859,13 @@
 
 
 %changelog
+* Tue Jan 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-4.1
+- next milestone
+- drop integrated openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
+- drop integrated openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
+- drop integrated workspace.sw8u10bf04.patch
+- drop integrated workspace.impress132.patch
+
 * Mon Jan 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.3
 - fix openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch for warren
 - fix openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch


--- openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch DELETED ---


--- openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch DELETED ---


--- workspace.impress132.patch DELETED ---


--- workspace.sw8u10bf04.patch DELETED ---