From 11f3f9b7e79df65f2f50e59ec04cc1467e1e1ed3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Mar 04 2009 12:30:24 +0000
Subject: - Remove Totem as handling Blu-ray and HD-DVD

- Use brasero-ncb.desktop instead of nautilus-cd-burner for blank devices
- Update media mime-types for Rhythmbox/Totem

---

diff --git a/defaults.list b/defaults.list
index 713ce30..4aef4be 100644
--- a/defaults.list
+++ b/defaults.list
@@ -80,15 +80,15 @@ application/x-rpm=gpk-install-file.desktop
 text/plain=gedit.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
-x-content/blank-bd=nautilus-cd-burner.desktop
-x-content/blank-hddvd=nautilus-cd-burner.desktop
+x-content/blank-cd=brasero-ncb.desktop
+x-content/blank-dvd=brasero-ncb.desktop
+x-content/blank-bd=brasero-ncb.desktop
+x-content/blank-hddvd=brasero-ncb.desktop
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop
-x-content/video-blueray=totem.desktop
-x-content/video-hddvd=totem.desktop
+#x-content/video-blueray=totem.desktop
+#x-content/video-hddvd=totem.desktop
 x-content/audio-cdda=rhythmbox.desktop
 x-content/audio-dvd=rhythmbox.desktop
 x-content/audio-player=rhythmbox.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 1a307a2..9f997ea 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.60
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Wed Mar 04 2009 - Bastien Nocera <bnocera@redhat.com> - 0.60-3
+- Remove Totem as handling Blu-ray and HD-DVD
+- Use brasero-ncb.desktop instead of nautilus-cd-burner for blank devices
+- Update media mime-types for Rhythmbox/Totem
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.60-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/totem-defaults.list b/totem-defaults.list
index 9afcfad..3810358 100644
--- a/totem-defaults.list
+++ b/totem-defaults.list
@@ -1,8 +1,10 @@
+application/mxf=totem.desktop;
 application/ogg=totem.desktop;rhythmbox.desktop;
 application/ram=totem.desktop;
 application/sdp=totem.desktop;
 application/smil=totem.desktop;
 application/smil+xml=totem.desktop;
+application/vnd.ms-wpl=totem.desktop;
 application/x-extension-m4a=totem.desktop;
 application/x-extension-mp4=totem.desktop;
 application/x-flac=totem.desktop;
@@ -25,8 +27,10 @@ audio/mp4=totem.desktop;
 audio/mpeg=totem.desktop;rhythmbox.desktop;
 audio/mpegurl=totem.desktop;
 audio/ogg=totem.desktop;
+audio/prs.sid=totem.desktop;
 audio/x-ape=totem.desktop;
 audio/x-flac=totem.desktop;rhythmbox.desktop;
+audio/x-gsm=totem.desktop;
 audio/x-it=totem.desktop;
 audio/x-m4a=totem.desktop;
 audio/x-matroska=totem.desktop;
@@ -79,6 +83,7 @@ video/x-m4v=totem.desktop;
 video/x-matroska=totem.desktop;
 video/x-mpeg=totem.desktop;
 video/x-ms-asf=totem.desktop;
+video/x-ms-asx=totem.desktop;
 video/x-msvideo=totem.desktop;
 video/x-ms-wm=totem.desktop;
 video/x-ms-wmv=totem.desktop;
@@ -87,3 +92,4 @@ video/x-ms-wvx=totem.desktop;
 video/x-nsv=totem.desktop;
 video/x-ogm+ogg=totem.desktop;
 video/x-theora+ogg=totem.desktop;
+video/x-totem-stream=totem.desktop;