[openoffice.org/f14/master] Resolves: rhbz#635030 fix double-slash in sd menubar.xml

[Caolan McNamara]

commit be82d30c71445b3a3c72736e2e5e98b0f0dd04f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 18 11:55:31 2010 +0100

    Resolves: rhbz#635030 fix double-slash in sd menubar.xml

 openoffice.org.spec        |    5 ++++-
 workspace.cmcfixes79.patch |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 73303b6..fd4bb70 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 8
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3844,6 +3844,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Sat Sep 18 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-8.2
+- Resolves: rhbz#635030 fix double-slash in sd menubar.xml
+
 * Fri Sep 17 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-8.1
 - latest version
 
diff --git a/workspace.cmcfixes79.patch b/workspace.cmcfixes79.patch
index 88b9346..e534ef2 100644
--- a/workspace.cmcfixes79.patch
+++ b/workspace.cmcfixes79.patch
@@ -115,8 +115,8 @@ diff -r 5893d50a0b8c sd/uiconfig/simpress/menubar/menubar.xml
  				<menu:menupopup>
 -					<menu:menuitem menu:id=".uno:SlideMasterPage"/>
 -					<menu:menuitem menu:id=".uno:NotesMasterPage"/>
-+					<menu:menuitem menu:id=".uno:SlideMasterPage" menu:style="radio"//>
-+					<menu:menuitem menu:id=".uno:NotesMasterPage" menu:style="radio"//>
++					<menu:menuitem menu:id=".uno:SlideMasterPage" menu:style="radio"/>
++					<menu:menuitem menu:id=".uno:NotesMasterPage" menu:style="radio"/>
          			<menu:menuseparator/>
                 		<menu:menuitem menu:id=".uno:MasterLayouts"/>
  				</menu:menupopup>