rpms/openoffice.org/devel openoffice.org.spec, 1.2301, 1.2302 openoffice.org-3.3.0.ooo111699.svx.nullfield.patch, 1.2, NONE workspace.tl81.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.3.0.ooo111699.svx.nullfield.patch 
	workspace.tl81.patch 
Log Message:
update


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2301
retrieving revision 1.2302
diff -u -p -r1.2301 -r1.2302
--- openoffice.org.spec	27 Jul 2010 14:33:04 -0000	1.2301
+++ openoffice.org.spec	27 Jul 2010 15:27:43 -0000	1.2302
@@ -100,22 +100,21 @@ Patch22: openoffice.org-3.2.0.ooo108846.
 Patch23: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
 Patch24: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
 Patch25: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch26: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
-Patch27: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch28: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch29: workspace.writerfilter08.patch
-Patch30: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch31: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch32: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch33: workspace.vcl113.patch
-Patch34: workspace.tl81.patch
-Patch35: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch36: workspace.gtk3.patch
-Patch37: workspace.sb128.patch
-Patch38: workspace.cmcfixes77.patch
-Patch39: workspace.sb126.patch
-Patch40: workspace.vcl114.patch
-Patch41: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch26: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch27: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch28: workspace.writerfilter08.patch
+Patch29: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+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
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1629,22 +1628,21 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch23 -p1 -b .ooo95369.sw.sortedobjs.patch
 %patch24 -p1 -b .ooo74188.indiccursor.editeng.patch
 %patch25 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch26 -p0 -b .ooo111699.svx.nullfield.patch
-%patch27 -p0 -b .ooo111758.sd.xerror.patch
-%patch28 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch29 -p0 -b .workspace.writerfilter08.patch
-%patch30 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch31 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch32 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch33 -p0 -b .workspace.vcl113.patch
-%patch34 -p0 -b .workspace.tl81.patch
-%patch35 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch36 -p0 -b .workspace.gtk3.patch
-%patch37 -p1 -b .workspace.sb128.patch
-%patch38 -p1 -b .workspace.cmcfixes77.patch
-%patch39 -p1 -b .workspace.sb126.patch
-%patch40 -p0 -b .workspace.vcl114.patch
-%patch41 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+%patch26 -p0 -b .ooo111758.sd.xerror.patch
+%patch27 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch28 -p0 -b .workspace.writerfilter08.patch
+%patch29 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%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
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3789,6 +3787,7 @@ unopkg remove --shared org.openoffice.le
 %changelog
 * 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
 
 * Thu Jul 22 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.5
 - Resolves: rhbz#617210 allow linking with gold


--- openoffice.org-3.3.0.ooo111699.svx.nullfield.patch DELETED ---


--- workspace.tl81.patch DELETED ---