rpms/openoffice.org/devel openoffice.org.spec, 1.1864, 1.1865 workspace.rptfix06.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-serv21446

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.rptfix06.patch 
Log Message:
drop integrated workspace.rptfix06.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1864
retrieving revision 1.1865
diff -u -r1.1864 -r1.1865
--- openoffice.org.spec	19 Mar 2009 09:36:44 -0000	1.1864
+++ openoffice.org.spec	23 Mar 2009 10:27:05 -0000	1.1865
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 6
-%define rh_rpm_release 3
+%define ooomilestone 7
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -128,10 +128,9 @@
 Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
 Patch55: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
-Patch56: workspace.rptfix06.patch
-Patch57: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch58: ooo-build.ooo2497.filter.svg.patch
-Patch59: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch56: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch57: ooo-build.ooo2497.filter.svg.patch
+Patch58: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1618,10 +1617,9 @@
 %patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
 %patch55 -p1 -b .gccXXXXX.sw.typeillness.patch
-%patch56 -p0 -b .workspace.rptfix06.patch
-%patch57 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch58 -p1 -b .ooo2497.filter.svg.patch
-%patch59 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch56 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch57 -p1 -b .ooo2497.filter.svg.patch
+%patch58 -p0 -b .ooo100353.svx.rtfbrackets.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4109,6 +4107,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Mar 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-7.1
+- drop integrated workspace.rptfix06.patch
+
 * Thu Mar 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-6.3
 - Resolves: rhbz#490924 whacked out handling of tlswg custom token
 


--- workspace.rptfix06.patch DELETED ---