From 06e2e92cc59e7d8290e4a383f43798989d9fb3c3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Mon, 1 Sep 2008 15:22:30 +0000
Subject: [PATCH] - Use Firefox and not redhat-web as the default app for HTML
 files     (#452184)

---
 defaults.list         | 2 +-
 shared-mime-info.spec | 5 ++++-
 totem-defaults.list   | 8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/defaults.list b/defaults.list
index 30378f3..3878291 100644
--- a/defaults.list
+++ b/defaults.list
@@ -78,7 +78,7 @@ application/x-abiword=gnome-abiword.desktop
 application/x-dvi=tetex-xdvi.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gnome-gedit.desktop
-text/html=redhat-web.desktop
+text/html=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
 x-content/blank-cd=nautilus-cd-burner.desktop
 x-content/blank-dvd=nautilus-cd-burner.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index ed5c440..83dc7f8 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.51
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -63,6 +63,9 @@ cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 %{_mandir}/man*/*
 
 %changelog
+* Mon Sep 01 2008 - Bastien Nocera <bnocera@redhat.com> - 0.51-2
+- Use Firefox and not redhat-web as the default app for HTML files (#452184)
+
 * Wed Jul 23 2008 - Bastien Nocera <bnocera@redhat.com> - 0.51-1
 - Update to 0.51
 
diff --git a/totem-defaults.list b/totem-defaults.list
index 6ecb8d8..9afcfad 100644
--- a/totem-defaults.list
+++ b/totem-defaults.list
@@ -2,6 +2,7 @@ application/ogg=totem.desktop;rhythmbox.desktop;
 application/ram=totem.desktop;
 application/sdp=totem.desktop;
 application/smil=totem.desktop;
+application/smil+xml=totem.desktop;
 application/x-extension-m4a=totem.desktop;
 application/x-extension-mp4=totem.desktop;
 application/x-flac=totem.desktop;
@@ -19,6 +20,7 @@ audio/ac3=totem.desktop;
 audio/AMR=totem.desktop;
 audio/AMR-WB=totem.desktop;
 audio/basic=totem.desktop;
+audio/midi=totem.desktop;
 audio/mp4=totem.desktop;
 audio/mpeg=totem.desktop;rhythmbox.desktop;
 audio/mpegurl=totem.desktop;
@@ -43,10 +45,12 @@ audio/x-pn-wav=totem.desktop;
 audio/x-pn-windows-acm=totem.desktop;
 audio/x-sbc=totem.desktop;
 audio/x-scpls=totem.desktop;rhythmbox.desktop;
+audio/x-speex=totem.desktop;
 audio/x-tta=totem.desktop;
 audio/x-wav=totem.desktop;
 audio/x-wavpack=totem.desktop;
-audio/x-vorbis=totem.desktop;
+audio/x-vorbis=totem.desktop;rhythmbox.desktop;
+audio/x-vorbis+ogg=totem.desktop;rhythmbox.desktop;
 audio/x-xm=totem.desktop;
 image/x-pict=totem.desktop;
 misc/ultravox=totem.desktop;
@@ -60,6 +64,7 @@ video/mp4=totem.desktop;
 video/mp4v-es=totem.desktop;
 video/mpeg=totem.desktop;
 video/msvideo=totem.desktop;
+video/ogg=totem.desktop;
 video/quicktime=totem.desktop;
 video/vivo=totem.desktop;
 video/vnd.divx=totem.desktop;
@@ -69,6 +74,7 @@ video/x-avi=totem.desktop;
 video/x-flc=totem.desktop;
 video/x-fli=totem.desktop;
 video/x-flic=totem.desktop;
+video/x-flv=totem.desktop;
 video/x-m4v=totem.desktop;
 video/x-matroska=totem.desktop;
 video/x-mpeg=totem.desktop;