rpms/openoffice.org/devel openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch, NONE, 1.1 openoffice.org.spec, 1.790, 1.791

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 25 15:47:59 UTC 2006 

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15720

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch 
Log Message:
build failed, merge new bits into current

openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch:
 _viewsh.sdi |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch ---
Index: sdi/_viewsh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_viewsh.sdi,v
retrieving revision 1.28.82.1
retrieving revision 1.28
diff -u -r1.28.82.1 -r1.28
--- openoffice.org.orig/sw/sdi/_viewsh.sdi	30 Jun 2006 05:47:01 -0000	1.28.82.1
+++ openoffice.org/sw/sdi/_viewsh.sdi	2 May 2006 15:16:04 -0000	1.28
@@ -622,6 +622,12 @@
         Export = FALSE;
     ]
 
+    FN_PRINT_LAYOUT
+    [
+        ExecMethod = ExecViewOptions ;
+        StateMethod = StateViewOptions ;
+        Export = FALSE;
+    ]
      // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden funktionieren
     FN_RULER // status()
     [


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- openoffice.org.spec	25 Jul 2006 10:55:29 -0000	1.790
+++ openoffice.org.spec	25 Jul 2006 15:47:56 -0000	1.791
@@ -91,39 +91,38 @@
 Patch25: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch27: workspace.bfsixtyfour.patch
-Patch28: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
-Patch29: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
-Patch30: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
-Patch31: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch32: workspace.fpicker6.patch
-Patch33: workspace.vcl59.patch
-Patch34: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch35: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch36: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
-Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
-Patch41: workspace.sixtyfour06.patch
-Patch42: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
-Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
-Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
-Patch50: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
-Patch51: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
-Patch52: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch53: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-Patch54: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch55: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
-Patch57: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch58: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch59: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch60: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+Patch28: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
+Patch29: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
+Patch30: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
+Patch31: workspace.fpicker6.patch
+Patch32: workspace.vcl59.patch
+Patch33: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch34: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch35: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
+Patch36: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch37: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch38: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+Patch39: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch40: workspace.sixtyfour06.patch
+Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch42: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
+Patch43: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch44: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch47: ooobuild.VBAObjects.patch
+Patch48: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
+Patch49: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
+Patch50: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch51: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch52: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+Patch53: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch54: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch55: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch56: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+Patch59: openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -842,39 +841,38 @@
 %patch25 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch27 -p1 -b .workspace.bfsixtyfour.patch
-# %patch28 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
-%patch29 -p1 -b .ooo65318.agg24.canvas.patch
-%patch30 -p1 -b .ooo65308.notespaste.sd.patch
-%patch31 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch32 -p1 -b .workspace.fpicker6.patch
-%patch33 -p1 -b .workspace.vcl59.patch
-%patch34 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch35 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch36 -p1 -b .ooo65767.vcl.removemenukey.patch
-%patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch40 -p1 -b .ooo65519.printing.samba.patch
-%patch41 -p1 -b .workspace.sixtyfour06.patch
-%patch42 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
-%patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch45 -p1 -b .ooo66510.shell.recentlyused.patch
-%patch46 -p1 -b .rh187919.gtkunderkde.patch
-%patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
-%patch50 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
-%patch51 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
-%patch52 -p1 -b .ooo67644.sw.spacing.patch
-%patch53 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
-%patch54 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch55 -p1 -b .ooo67716.svx.overflow.patch
-%patch56 -p1 -b .gcc28409.anonymousexternc.patch
-%patch57 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch58 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch59 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch60 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
+%patch28 -p1 -b .ooo65318.agg24.canvas.patch
+%patch29 -p1 -b .ooo65308.notespaste.sd.patch
+%patch30 -p1 -b .ooo65327.builddep.writerperfect.patch
+%patch31 -p1 -b .workspace.fpicker6.patch
+%patch32 -p1 -b .workspace.vcl59.patch
+%patch33 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch34 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch35 -p1 -b .ooo65767.vcl.removemenukey.patch
+%patch36 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch37 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch38 -p1 -b .ooo66067.embeddedobj.crash.patch
+%patch39 -p1 -b .ooo65519.printing.samba.patch
+%patch40 -p1 -b .workspace.sixtyfour06.patch
+%patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch42 -p1 -b .ooo66851.i18npool.x86_64.patch
+%patch43 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch44 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch45 -p1 -b .rh187919.gtkunderkde.patch
+%patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch47 -p0 -b .ooobuild.VBAObjects.patch
+%patch48 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
+%patch49 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
+%patch50 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch51 -p1 -b .ooo67644.sw.spacing.patch
+%patch52 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
+%patch53 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch54 -p1 -b .ooo67716.svx.overflow.patch
+%patch55 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch56 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
+%patch59 -p1 -b .ooo65081.sw.layoutsmenu.patch
 
 tar xzf %{SOURCE1}
 
@@ -3361,6 +3359,9 @@
 - rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - rh#200059# -> openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 - rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+- rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
+- drop openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
+- drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - reenable visibility support

More information about the fedora-cvs-commits mailing list