rpms/shared-mime-info/devel defaults.list, 1.29, 1.30 shared-mime-info.spec, 1.83, 1.84

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2760

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Tue Jun 01 2010 Bastien Nocera <bnocera at redhat.com> 0.71-2
- Update some OO.o defaults, patch from Caolan McNamara



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- defaults.list	24 Sep 2009 12:52:05 -0000	1.29
+++ defaults.list	1 Jun 2010 10:02:44 -0000	1.30
@@ -46,15 +46,20 @@ application/vnd.ms-word=openoffice.org-w
 application/vnd.wordperfect=openoffice.org-writer.desktop
 application/vnd.sun.xml.writer=openoffice.org-writer.desktop
 application/vnd.sun.xml.writer.global=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.template=openoffice.org-writer.desktop
 application/vnd.stardivision.writer=openoffice.org-writer.desktop
 application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
 application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
 application/vnd.oasis.opendocument.text-web=openoffice.org-writer.desktop
 application/vnd.oasis.opendocument.text-master=openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=openoffice.org-writer.desktop
 application/vnd.ms-excel=openoffice.org-calc.desktop
 application/vnd.stardivision.calc=openoffice.org-calc.desktop
 application/vnd.sun.xml.calc=openoffice.org-calc.desktop
 application/vnd.sun.xml.calc.template=openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=openoffice.org-calc.desktop
 application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
 application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
 application/vnd.ms-powerpoint=openoffice.org-impress.desktop
@@ -63,9 +68,18 @@ application/vnd.sun.xml.impress=openoffi
 application/vnd.sun.xml.impress.template=openoffice.org-impress.desktop
 application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
 application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=openoffice.org-impress.desktop
 application/vnd.stardivision.draw=openoffice.org-draw.desktop
 application/vnd.sun.xml.draw=openoffice.org-draw.desktop
 application/vnd.sun.xml.draw.template=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.graphics=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.formula=openoffice.org-math.desktop
+application/vnd.sun.xml.math=openoffice.org-math.desktop
+application/vnd.stardivision.math=openoffice.org-math.desktop
+application/vnd.oasis.opendocument.database=openoffice.org-base.desktop
+application/vnd.sun.xml.base=openoffice.org-base.desktop
 application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- shared-mime-info.spec	1 Feb 2010 17:47:32 -0000	1.83
+++ shared-mime-info.spec	1 Jun 2010 10:02:44 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.71
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jun 01 2010 Bastien Nocera <bnocera at redhat.com> 0.71-2
+- Update some OO.o defaults, patch from Caolan McNamara
+
 * Mon Feb 01 2010 Bastien Nocera <bnocera at redhat.com> 0.71-1
 - Update to 0.71