rpms/openoffice.org/devel openoffice.org.spec,1.2302,1.2303

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25646

Modified Files:
	openoffice.org.spec 
Log Message:
update


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2302
retrieving revision 1.2303
diff -u -p -r1.2302 -r1.2303
--- openoffice.org.spec	27 Jul 2010 15:27:43 -0000	1.2302
+++ openoffice.org.spec	27 Jul 2010 15:30:44 -0000	1.2303
@@ -107,14 +107,13 @@ Patch29: openoffice.org-3.3.0.ooo112059.
 Patch30: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
 Patch31: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
 Patch32: workspace.vcl113.patch
-Patch33: workspace.tl81.patch
-Patch34: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch35: workspace.gtk3.patch
-Patch36: workspace.sb128.patch
-Patch37: workspace.cmcfixes77.patch
-Patch38: workspace.sb126.patch
-Patch39: workspace.vcl114.patch
-Patch40: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch33: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch34: workspace.gtk3.patch
+Patch35: workspace.sb128.patch
+Patch36: workspace.cmcfixes77.patch
+Patch37: workspace.sb126.patch
+Patch38: workspace.vcl114.patch
+Patch39: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1635,14 +1634,13 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch30 -p0 -b .ooo107490.cppu.lifecycle.patch
 %patch31 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
 %patch32 -p0 -b .workspace.vcl113.patch
-%patch33 -p0 -b .workspace.tl81.patch
-%patch34 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch35 -p0 -b .workspace.gtk3.patch
-%patch36 -p1 -b .workspace.sb128.patch
-%patch37 -p1 -b .workspace.cmcfixes77.patch
-%patch38 -p1 -b .workspace.sb126.patch
-%patch39 -p0 -b .workspace.vcl114.patch
-%patch40 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+%patch33 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch34 -p0 -b .workspace.gtk3.patch
+%patch35 -p1 -b .workspace.sb128.patch
+%patch36 -p1 -b .workspace.cmcfixes77.patch
+%patch37 -p1 -b .workspace.sb126.patch
+%patch38 -p0 -b .workspace.vcl114.patch
+%patch39 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3788,6 +3786,7 @@ unopkg remove --shared org.openoffice.le
 * Tue Jul 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.1
 - latest milestone
 - drop integrated openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
+- drop integrated workspace.tl81.patch
 
 * Thu Jul 22 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.5
 - Resolves: rhbz#617210 allow linking with gold