rpms/shared-mime-info/devel defaults.list, 1.10, 1.11 shared-mime-info.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30960

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
prefer OOO for oasis formats


Index: defaults.list
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- defaults.list	2 Nov 2005 18:29:17 -0000	1.10
+++ defaults.list	30 Jan 2006 10:14:33 -0000	1.11
@@ -44,14 +44,22 @@
 application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop
 application/vnd.sun.xml.writer.global=openoffice.org-1.9-writer.desktop
 application/vnd.stardivision.writer=openoffice.org-1.9-writer.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-1.9-writer.desktop
+application/vnd.oasis.opendocument.text-template=openoffice.org-1.9-writer.desktop
+application/vnd.oasis.opendocument.text-web=openoffice.org-1.9-writer.desktop
+application/vnd.oasis.opendocument.text-master=openoffice.org-1.9-writer.desktop
 application/vnd.ms-excel=openoffice.org-1.9-calc.desktop
 application/vnd.stardivision.calc=openoffice.org-1.9-calc.desktop
 application/vnd.sun.xml.calc=openoffice.org-1.9-calc.desktop
 application/vnd.sun.xml.calc.template=openoffice.org-1.9-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-1.9-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-1.9-calc.desktop
 application/vnd.ms-powerpoint=openoffice.org-1.9-impress.desktop
 application/vnd.stardivision.impress=openoffice.org-1.9-impress.desktop
 application/vnd.sun.xml.impress=openoffice.org-1.9-impress.desktop
 application/vnd.sun.xml.impress.template=openoffice.org-1.9-impress.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-1.9-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-1.9-impress.desktop
 application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop
 application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop
 application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- shared-mime-info.spec	19 Dec 2005 16:52:08 -0000	1.30
+++ shared-mime-info.spec	30 Jan 2006 10:14:34 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.16.cvs20051219
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -62,6 +62,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jan 30 2006 Caolan McNamara <caolanm at redhat.com> - 0.16.cvs20051219-2
+- rh#179138# add openoffice.org as preferred app for oasis formats 
+
 * Mon Dec 19 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051219-1
 - Newer cvs snapshot