[openoffice.org/f14/master] next milestone

[Caolan McNamara]

commit b7c3e4730f993cf261c78c9cca3998dc5ae6d3d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 8 09:19:53 2010 +0100

    next milestone

 .gitignore                 |    2 +-
 openoffice.org.spec        |   22 +++--
 sources                    |    2 +-
 workspace.impress197.patch |  221 --------------------------------------------
 4 files changed, 14 insertions(+), 233 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7969283..16e9adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 description.xml
 manifest.xml
-OOO330_m6.tar.bz2
+OOO330_m7.tar.bz2
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 5e52cf1..5f10954 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
-%define ooomilestone 6
-%define rh_rpm_release 2
+%define ooomilestone 7
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -114,10 +114,9 @@ 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
-Patch40: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
-Patch41: workspace.cmcfixes78.patch
-Patch42: openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
+Patch39: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
+Patch40: workspace.cmcfixes78.patch
+Patch41: openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1644,10 +1643,9 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %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
-%patch40 -p1 -b .ooo113856.vcl.mutter.patch
-%patch41 -p1 -b .workspace.cmcfixes78.patch
-%patch42 -p0 -b .ooo114012.sd.bada11ychain.patch
+%patch39 -p1 -b .ooo113856.vcl.mutter.patch
+%patch40 -p1 -b .workspace.cmcfixes78.patch
+%patch41 -p0 -b .ooo114012.sd.bada11ychain.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3837,6 +3835,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Sep 07 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-7.1
+- next milestone
+- drop integrated workspace.impress197.patch
+
 * Mon Sep 06 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-6.2
 - Resolves: rhbz#630344 handle upgrade from broken extension dir to fixed extension dir
 
diff --git a/sources b/sources
index 11a2bf1..9c16dce 100644
--- a/sources
+++ b/sources
@@ -16,4 +16,4 @@ f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 011e6e849144d5ca35299f015073652b  redhat-registry.tar.gz
 5d4db996b3fe3169bb3cc6af22aec605  description.xml
 22be99cb6dbf147543154099d3db0dfa  manifest.xml
-c3ebb2cbc89fab8703559fe87553cd72  OOO330_m6.tar.bz2
+c2533a0542f91ebc5c010543a25ef1a3  OOO330_m7.tar.bz2