rpms/openoffice.org/devel openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch, NONE, 1.1 openoffice.org.spec, 1.358, 1.359 workspace.cmcfixes12, 1.3, 1.4

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 26 14:51:45 UTC 2005 

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.cmcfixes12 
Added Files:
	openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch 
Log Message:
missing forward decl

openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch:
 desktop/menus/base.desktop          |    0 
 desktop/menus/calc.desktop          |    0 
 desktop/menus/impress.desktop       |    0 
 desktop/menus/writer.desktop        |    0 
 sysui/desktop/menus/base.desktop    |    2 +-
 sysui/desktop/menus/calc.desktop    |    2 +-
 sysui/desktop/menus/impress.desktop |    2 +-
 sysui/desktop/menus/writer.desktop  |    2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch ---
Index: desktop/menus/base.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/base.desktop,v
retrieving revision 1.6
diff -u -p -u -r1.6 base.desktop
--- openoffice.org.orig/sysui/desktop/menus/base.desktop	13 May 2005 09:27:14 -0000	1.6
+++ openoffice.org/sysui/desktop/menus/base.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -base %U
 MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
-Name=%PRODUCTNAME Base
+Name=Database Development
 Comment=Manage databases, create queries and reports to track and manage your information by using Base.
Index: desktop/menus/calc.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/calc.desktop,v
retrieving revision 1.7
diff -u -p -u -r1.7 calc.desktop
--- openoffice.org.orig/sysui/desktop/menus/calc.desktop	24 Feb 2005 16:13:30 -0000	1.7
+++ openoffice.org/sysui/desktop/menus/calc.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -calc %U
 MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel
-Name=%PRODUCTNAME Calc
+Name=Spreadsheet
 Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
Index: desktop/menus/impress.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/impress.desktop,v
retrieving revision 1.8
diff -u -p -u -r1.8 impress.desktop
--- openoffice.org.orig/sysui/desktop/menus/impress.desktop	20 Apr 2005 11:35:17 -0000	1.8
+++ openoffice.org/sysui/desktop/menus/impress.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -impress %U
 MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint
-Name=%PRODUCTNAME Impress
+Name=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
Index: desktop/menus/writer.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/writer.desktop,v
retrieving revision 1.9
diff -u -p -u -r1.9 writer.desktop
--- openoffice.org.orig/sysui/desktop/menus/writer.desktop	20 Apr 2005 11:35:35 -0000	1.9
+++ openoffice.org/sysui/desktop/menus/writer.desktop	26 Jul 2005 12:53:41 -0000
@@ -8,5 +8,5 @@ InitialPreference=2
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Exec=openoffice -writer %U
 MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect
-Name=%PRODUCTNAME Writer
+Name=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- openoffice.org.spec	26 Jul 2005 11:55:13 -0000	1.358
+++ openoffice.org.spec	26 Jul 2005 14:51:42 -0000	1.359
@@ -1,5 +1,5 @@
 %define ooo2ver 121
-%define ooo_rpm_release 2
+%define ooo_rpm_release 3
 %define build_fc4 0
 %define build_fc5 1
 
@@ -17,12 +17,16 @@
 %define internalxmlsec 1
 %define internaldb 1
 %define includeemailmerge 0
+%define cripplemenus 0
+%define seperatebase 0
 %endif
 %if %{build_fc5}
 %define release_extension .2.0.fc5
 %define internalxmlsec 0
 %define internaldb 1
 %define includeemailmerge 1
+%define cripplemenus 1
+%define seperatebase 1
 %endif
 
 %if %{usegcc3}
@@ -160,6 +164,7 @@
 Patch57: workspace.cmcfixes12
 Patch58: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
 Patch59: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch60: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -217,6 +222,7 @@
 external to %{name} and within the internal %{name} scripting module to be
 written in python
 
+%if %{seperatebase}
 %package base
 Summary: database frontend for %{name}
 Group: Development/Libraries
@@ -225,6 +231,7 @@
 %description base
 Gui database frontend for %{name}. Allows creation and management of databases
 through a GUI.
+%endif
 
 %package writer
 Summary: writer module for %{name}
@@ -805,15 +812,16 @@
 %patch52 -p1 -b .ooo51912.nullpointer.wizards.patch
 %patch53 -p1 -b .ooo52023.evoadb2.nognuconst.patch
 %patch54 -p1 -b .ooo52048.inhalt.sw.patch
-%if %{build_fc5}
 %patch55 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
-%endif
 %patch56 -p1 -b .ooo49720.mozillanspr.extensions.patch
 %patch57 -p1 -b .workspace.cmcfixes12
 %patch58 -p1 -b .ooo52428.execshield.bridges.patch
 %if %{build_fc5}
 %patch59 -p1 -b .rh127576.gnomeprintui.patch
 %endif
+%if %{cripplemenus}
+%patch60 -p1 -b .rh156677.cripplemenus.sysui.patch
+%endif
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -871,7 +879,7 @@
 	export MAXBUILDS=2
 fi
 #make no rpms in sysui for menus
-export RPM=echo
+export RPM=true
 #Set the "This product has been created by..." in Help->About
 export USER="RedHat Inc."
 unset USERNAME
@@ -1025,13 +1033,13 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+%if ! %{cripplemenus}
+mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+%endif
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
-#cp -r sysui/unxlng*/misc/redhat/usr/share/application-registry $RPM_BUILD_ROOT/%{_datadir}
-rm -rf sysui/unxlng*/misc/redhat/usr/share/application-registry
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons
 tar -C $RPM_BUILD_ROOT/%{_datadir}/icons -xzf %{SOURCE1}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -2588,6 +2596,26 @@
 %{_datadir}/icons
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
+# base files
+%if ! %{seperatebase}
+%{instdir}/help/en/sdatabase.*
+%{instdir}/program/sbase
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
+%{_bindir}/oobase
+%dir %{_datadir}/applications
+%{_datadir}/applications/openoffice.org-1.9-base.desktop
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
+%{_datadir}/mimelnk/application/openoffice.org-1.9-oasis-database.desktop
+%endif
 
 %post core
 update-desktop-database -q %{_datadir}/applications
@@ -2607,6 +2635,7 @@
   fi
 done
 
+%if %{seperatebase}
 %files base
 %{instdir}/help/en/sdatabase.*
 %{instdir}/program/sbase
@@ -2631,6 +2660,7 @@
 
 %postun base
 update-desktop-database -q %{_datadir}/applications
+%endif
 
 %files calc
 %defattr(-,root,root)
@@ -2730,7 +2760,9 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
 %dir %{_datadir}/applications
+%if ! %{cripplemenus}
 %{_datadir}/applications/openoffice.org-1.9-draw.desktop
+%endif
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*drawing*
@@ -2926,7 +2958,9 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
 %dir %{_datadir}/applications
+%if ! %{cripplemenus}
 %{_datadir}/applications/openoffice.org-1.9-math.desktop
+%endif
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*formula*
@@ -3033,6 +3067,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Jul 25 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.121-3
+- add rh#156677# menu changes
+
 * Mon Jul 25 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.121-2
 - rh#127576# add libgnomeprintui 
 - make database front end into pseudo subpackage


Index: workspace.cmcfixes12
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.cmcfixes12,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.cmcfixes12	26 Jul 2005 12:42:19 -0000	1.3
+++ workspace.cmcfixes12	26 Jul 2005 14:51:42 -0000	1.4
@@ -53,7 +53,7 @@
  // ----------------
  
 +class VirtualDevice;
-+
++class Printer;
  class VCL_DLLPUBLIC OutputDevice : public Resource
  {
  	friend class Application;

More information about the fedora-cvs-commits mailing list