[openoffice.org/f14/master] remove openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch

Caolan McNamara caolanm at fedoraproject.org
Tue Aug 3 11:11:57 UTC 2010


commit bfb43a08d15b06717fdde50ffed0dc03a667a937
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 3 12:11:34 2010 +0100

    remove openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch

 ...ce.org-3.3.0.ooo74188.indiccursor.editeng.patch |   37 --------
 openoffice.org.spec                                |   69 +++++++--------
 workspace.sb128.patch                              |   91 --------------------
 3 files changed, 34 insertions(+), 163 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 9e76d85..153fe3f 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 2
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -97,23 +97,21 @@ Patch20: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
 Patch21: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
 Patch22: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
 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.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: 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
-Patch40: openoffice.org-gccXXXXX.idlc.patch
+Patch24: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch25: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch26: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch27: workspace.writerfilter08.patch
+Patch28: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch29: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch30: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch31: workspace.vcl113.patch
+Patch32: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch33: workspace.gtk3.patch
+Patch34: workspace.cmcfixes77.patch
+Patch35: workspace.sb126.patch
+Patch36: workspace.vcl114.patch
+Patch37: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch38: openoffice.org-gccXXXXX.idlc.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1625,23 +1623,21 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch21 -p1 -b .ooo108637.sfx2.uisavedir.patch
 %patch22 -p1 -b .ooo108846.sfx2.qstartfixes.patch
 %patch23 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch24 -p1 -b .ooo74188.indiccursor.editeng.patch
-%patch25 -p0 -b .ooo110142.svx.safercolornames.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 .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 .ooo113273.desktop.resolvelinks.patch
-%patch40 -p1 -b .gccXXXXX.idlc.patch
+%patch24 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch25 -p0 -b .ooo111758.sd.xerror.patch
+%patch26 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch27 -p0 -b .workspace.writerfilter08.patch
+%patch28 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch29 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch30 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch31 -p0 -b .workspace.vcl113.patch
+%patch32 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch33 -p0 -b .workspace.gtk3.patch
+%patch34 -p1 -b .workspace.cmcfixes77.patch
+%patch35 -p1 -b .workspace.sb126.patch
+%patch36 -p0 -b .workspace.vcl114.patch
+%patch37 -p0 -b .ooo113273.desktop.resolvelinks.patch
+%patch38 -p1 -b .gccXXXXX.idlc.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3783,6 +3779,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Aug 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.3
+- remove openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
+
 * Fri Jul 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.2
 - Resolves: rhbz#616508 abrt in atk_wrapper_focus_idle_handler
 


More information about the scm-commits mailing list