rpms/openoffice.org/devel openoffice.org.spec, 1.1509, 1.1510 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch, 1.3, NONE openoffice.org-2.4.0.ooo85097.desktop.pagein.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch 
	openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1509
retrieving revision 1.1510
diff -u -r1.1509 -r1.1510
--- openoffice.org.spec	22 May 2008 19:28:03 -0000	1.1509
+++ openoffice.org.spec	24 May 2008 15:55:56 -0000	1.1510
@@ -1,6 +1,6 @@
 %define oootag DEV300
-%define ooomilestone 13
-%define rh_rpm_release 2
+%define ooomilestone 14
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -109,25 +109,23 @@
 Patch35: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch36: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch37: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch38: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch39: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch40: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch41: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch42: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch43: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch44: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch45: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch46: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch47: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch48: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch49: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch50: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch51: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch52: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch53: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch54: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch55: openoffice.org-3.0.0.ooo89172.filter.string.patch
-Patch56: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch38: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch39: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch40: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch41: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch42: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch43: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch44: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch45: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch46: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch47: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch48: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch49: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch50: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch51: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+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
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1229,25 +1227,23 @@
 %patch35 -p1 -b .ooo76649.httpencoding.patch
 %patch36 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch37 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch38 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch39 -p1 -b .ooo85097.desktop.pagein.patch
-%patch40 -p1
-%patch41 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch42 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch43 -p1 -b .ooo85448.emptyrpath.patch
-%patch44 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch45 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch46 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch47 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch48 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch49 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch50 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch51 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch52 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch53 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch54 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch55 -p1 -b .ooo89172.filter.string.patch
-%patch56 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch38 -p1
+%patch39 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch40 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch41 -p1 -b .ooo85448.emptyrpath.patch
+%patch42 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch43 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch44 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch45 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch46 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch47 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch48 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch49 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch50 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch51 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch52 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch53 -p1 -b .ooo89172.filter.string.patch
+%patch54 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3367,8 +3363,11 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Thu May 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-2
-- require new hunspell-ml for Malayalam langpack
+* Sat May 24 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
+- next version
+- Require new hunspell-ml for Malayalam langpack
+- drop integrated openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+- drop integrated openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 
 * Mon May 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-1
 - next version


--- openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch DELETED ---


--- openoffice.org-2.4.0.ooo85097.desktop.pagein.patch DELETED ---