rpms/openoffice.org/devel openoffice.org.spec, 1.1860, 1.1861 workspace.cl12.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7099

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.cl12.patch 
Log Message:
next milestone


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1860
retrieving revision 1.1861
diff -u -r1.1860 -r1.1861
--- openoffice.org.spec	16 Mar 2009 23:19:53 -0000	1.1860
+++ openoffice.org.spec	17 Mar 2009 12:24:51 -0000	1.1861
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 5
-%define rh_rpm_release 2
+%define ooomilestone 6
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -127,9 +127,8 @@
 Patch52: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch55: workspace.cl12.patch
-Patch56: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
-Patch57: workspace.rptfix06.patch
+Patch55: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch56: workspace.rptfix06.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1615,9 +1614,8 @@
 %patch52 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch55 -p0 -b .workspace.cl12.patch
-%patch56 -p1 -b .gccXXXXX.sw.typeillness.patch
-%patch57 -p0 -b .workspace.rptfix06.patch
+%patch55 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch56 -p0 -b .workspace.rptfix06.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4105,6 +4103,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Mar 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-6.1
+- drop integrated workspace.cl12.patch
+
 * Mon Mar 16 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-5.2
 - re-enable system jfreereport
 


--- workspace.cl12.patch DELETED ---