rpms/openoffice.org/devel openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch, 1.1, 1.2 openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch, 1.1, 1.2 openoffice.org.spec, 1.667, 1.668

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch 
	openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch 
	openoffice.org.spec 
Log Message:
reorder

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(-)

Index: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch	26 Jul 2005 14:51:42 -0000	1.1
+++ openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch	21 Apr 2006 09:51:42 -0000	1.2
@@ -50,7 +50,7 @@
 @@ -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
+ 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;application/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.

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(-)

Index: openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch	20 Apr 2006 12:42:37 -0000	1.1
+++ openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch	21 Apr 2006 09:51:42 -0000	1.2
@@ -50,7 +50,7 @@
 @@ -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
+ 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;application/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.667
retrieving revision 1.668
diff -u -r1.667 -r1.668
--- openoffice.org.spec	21 Apr 2006 09:04:35 -0000	1.667
+++ openoffice.org.spec	21 Apr 2006 09:51:42 -0000	1.668
@@ -1096,6 +1096,7 @@
 %if %{gnomeprintui}
 %patch5  -p1 -b .rh127576.gnomeprintui.patch
 %endif
+%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %if %{obsoleteold}
 %patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
 %else
@@ -1131,7 +1132,6 @@
 %endif
 %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
 %patch28 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %patch30 -p1 -b .ooo59997.sw.defaultbullets.patch
 %patch31 -p1 -b .ooo19976.framework.nofocussteal.patch
 %patch32 -p1 -b .ooo61875.sd.compile.patch