[shared-mime-info/f15] Fix LibreOffice associations (patch from Caolan McNamara, #707971)

[Bastien Nocera]

commit 8d0e889ab6f3924a242b472d44e505abc91297a6
Author: Bastien Nocera <hadess at hadess.net>
Date:   Thu May 26 17:22:39 2011 +0100

    Fix LibreOffice associations (patch from Caolan McNamara, #707971)

 defaults.list         |   76 ++++++++++++++++++++++++------------------------
 shared-mime-info.spec |    5 ++-
 2 files changed, 42 insertions(+), 39 deletions(-)
---
diff --git a/defaults.list b/defaults.list
index 6e74c7c..56d3fce 100644
--- a/defaults.list
+++ b/defaults.list
@@ -26,44 +26,44 @@ image/x-xbitmap=gnome-eog.desktop;gthumb.desktop;
 image/x-xpixmap=gnome-eog.desktop;gthumb.desktop;
 image/x-xwindowdump=gnome-eog.desktop;gthumb.desktop;
 image/svg+xml=gnome-eog.desktop;gthumb.desktop;
-application/vnd.ms-word=openoffice.org-writer.desktop
-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
-application/vnd.stardivision.impress=openoffice.org-impress.desktop
-application/vnd.sun.xml.impress=openoffice.org-impress.desktop
-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/vnd.ms-word=libreoffice-writer.desktop
+application/vnd.wordperfect=libreoffice-writer.desktop
+application/vnd.sun.xml.writer=libreoffice-writer.desktop
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop
+application/vnd.stardivision.writer=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop
+application/vnd.ms-excel=libreoffice-calc.desktop
+application/vnd.stardivision.calc=libreoffice-calc.desktop
+application/vnd.sun.xml.calc=libreoffice-calc.desktop
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop
+application/vnd.ms-powerpoint=libreoffice-impress.desktop
+application/vnd.stardivision.impress=libreoffice-impress.desktop
+application/vnd.sun.xml.impress=libreoffice-impress.desktop
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop
+application/vnd.stardivision.draw=libreoffice-draw.desktop
+application/vnd.sun.xml.draw=libreoffice-draw.desktop
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop
+application/vnd.sun.xml.math=libreoffice-math.desktop
+application/vnd.stardivision.math=libreoffice-math.desktop
+application/vnd.oasis.opendocument.database=libreoffice-base.desktop
+application/vnd.sun.xml.base=libreoffice-base.desktop
 application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 3f0dc5d..511655a 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.90
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu May 26 2011 Bastien Nocera <bnocera at redhat.com> 0.90-8
+- Fix LibreOffice associations (patch from Caolan McNamara, #707971)
+
 * Thu Apr 21 2011 Bastien Nocera <bnocera at redhat.com> 0.90-7
 - Fix name of nautilus.desktop file (#698502)