[openoffice.org/f14/master] next milestone

[Caolan McNamara]

commit 1ee4f0b7696244df42a52b8e6937122fe082f9f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 12 15:05:44 2010 +0100

    next milestone

 .gitignore                     |    2 +-
 openoffice.org.spec            |   61 ++++++++++++++++++++-------------------
 sources                        |    2 +-
 workspace.writerfilter08.patch |   20 -------------
 4 files changed, 33 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cf78e4..9439556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,6 @@ ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-OOO330_m3.tar.bz2
 description.xml
 manifest.xml
+OOO330_m4.tar.bz2
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 0ac7b93..1021cbd 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
-%define ooomilestone 3
-%define rh_rpm_release 5
+%define ooomilestone 4
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -102,20 +102,19 @@ Patch23: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.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
-Patch39: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
-Patch40: workspace.impress197.patch
+Patch27: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch28: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch29: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch30: workspace.vcl113.patch
+Patch31: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch32: workspace.gtk3.patch
+Patch33: workspace.cmcfixes77.patch
+Patch34: workspace.sb126.patch
+Patch35: workspace.vcl114.patch
+Patch36: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch37: openoffice.org-gccXXXXX.idlc.patch
+Patch38: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
+Patch39: workspace.impress197.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1630,20 +1629,19 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %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
-%patch39 -p0 -b .ooo106591.sal.tradcopy.patch
-%patch40 -p1 -b .workspace.impress197.patch
+%patch27 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch28 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch29 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch30 -p0 -b .workspace.vcl113.patch
+%patch31 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch32 -p0 -b .workspace.gtk3.patch
+%patch33 -p1 -b .workspace.cmcfixes77.patch
+%patch34 -p1 -b .workspace.sb126.patch
+%patch35 -p0 -b .workspace.vcl114.patch
+%patch36 -p0 -b .ooo113273.desktop.resolvelinks.patch
+%patch37 -p1 -b .gccXXXXX.idlc.patch
+%patch38 -p0 -b .ooo106591.sal.tradcopy.patch
+%patch39 -p1 -b .workspace.impress197.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3819,6 +3817,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-4.1
+- drop integrated workspace.impress197.patch
+
 * Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.5
 - Resolves: rhbz#623613 scripting providers do not work (dtardon)
 
diff --git a/sources b/sources
index ff60bfc..aaec419 100644
--- a/sources
+++ b/sources
@@ -14,6 +14,6 @@ b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 20613b42d66eadc11c719374355f745c  redhat-langpacks.tar.gz
 011e6e849144d5ca35299f015073652b  redhat-registry.tar.gz
-15af8c5913850a90a14bc15876559655  OOO330_m3.tar.bz2
 5d4db996b3fe3169bb3cc6af22aec605  description.xml
 22be99cb6dbf147543154099d3db0dfa  manifest.xml
+a1a482e925e65efc7499b20e5cb3cb38  OOO330_m4.tar.bz2