rpms/openoffice.org/devel openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch, NONE, 1.1 openoffice.org.spec, 1.665, 1.666
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 20 12:42:40 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4716
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
Log Message:
allow to be installed in parallel in menus
openoffice.org-1.9.121.rh156677.other.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.other.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=OpenOffice.org 2 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=OpenOffice.org 2 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=OpenOffice.org 2 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.665
retrieving revision 1.666
diff -u -r1.665 -r1.666
--- openoffice.org.spec 20 Apr 2006 11:05:44 -0000 1.665
+++ openoffice.org.spec 20 Apr 2006 12:42:37 -0000 1.666
@@ -185,7 +185,11 @@
Patch3: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
Patch4: openoffice.org-1.9.97.rh156067.noversionedicons.patch
Patch5: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+%if %{obsoleteold}
Patch6: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+%else
+Patch6: openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
+%endif
Patch7: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
Patch8: openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
Patch9: openoffice.org-2.0.2.ooo34909.dbaccess.patch
@@ -1090,7 +1094,11 @@
%if %{gnomeprintui}
%patch5 -p1 -b .rh127576.gnomeprintui.patch
%endif
+%if %{obsoleteold}
%patch6 -p1 -b .rh156677.cripplemenus.sysui.patch
+%else
+%patch6 -p1 -b .rh156677.other.cripplemenus.sysui.patch
+%endif
%patch7 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
%patch8 -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
%patch9 -p1 -b .ooo34909.dbaccess.patch
More information about the fedora-cvs-commits
mailing list