[openoffice.org: 2/2] merge

[David Tardon]

commit e95f3a745c044f9d07bcc3e80a6725c0a47ceaee
Merge: 990e539 cf9a3d3
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 12 14:44:18 2010 +0200

    merge

 openoffice.org.spec        |    7 +-
 workspace.impress197.patch |  203 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+), 2 deletions(-)
---
diff --cc openoffice.org.spec
index fee8ebf,bcbf5c5..b0e93fe
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@@ -1,6 -1,6 +1,6 @@@
  %define oootag OOO330
  %define ooomilestone 3
--%define rh_rpm_release 4
++%define rh_rpm_release 5
  
  # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
  %define __jar_repack %{nil}
@@@ -3819,9 -3783,9 +3819,12 @@@ unopkg remove --shared org.openoffice.l
  %endif
  
  %changelog
- * Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.4
++* 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)
 +
+ * Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.4
 -- Resolves: rhbz#623609 CVE-2010-2935 CVE-2010-2936
++- Resolves: rhbz#623609 CVE-2010-2935 CVE-2010-2936 (caolanm)
+ 
  * Tue Aug 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.3
  - Resolves: rhbz#620574 Presentation for coccinelle: Start slide is a
    complete mess (dtardon)