rpms/openoffice.org/devel openoffice.org.spec, 1.1898, 1.1899 openoffice.org-3.1.0.ooo101152.solenv.kn.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-serv21539/devel

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch 
Log Message:
another master fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- openoffice.org.spec	24 Apr 2009 16:11:11 -0000	1.1898
+++ openoffice.org.spec	24 Apr 2009 16:46:02 -0000	1.1899
@@ -132,10 +132,9 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch59: workspace.vcl101.patch
-Patch60: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch61: workspace.slideshow1.patch
-Patch62: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch63: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: workspace.slideshow1.patch
+Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1626,10 +1625,9 @@
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch59 -p1 -b .workspace.vcl101.patch
-%patch60 -p1 -b .ooo101152.solenv.kn.patch
-%patch61 -p2 -b .workspace.slideshow1.patch
-%patch62 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch63 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p2 -b .workspace.slideshow1.patch
+%patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch62 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.ooo101152.solenv.kn.patch DELETED ---