rpms/shared-mime-info/devel totem-defaults.list, 1.2, 1.3 shared-mime-info.spec, 1.59, 1.60

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1797

Modified Files:
	shared-mime-info.spec 
Added Files:
	totem-defaults.list 
Log Message:
* Thu Mar 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.23-5
- Make Totem the default for the mime-types it handles (#366101)
- And make sure Rhythmbox is the second default only for the mime-types
  it handles



Index: totem-defaults.list
===================================================================
RCS file: totem-defaults.list
diff -N totem-defaults.list
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ totem-defaults.list	27 Mar 2008 22:05:11 -0000	1.3
@@ -0,0 +1,83 @@
+application/ogg=totem.desktop;rhythmbox.desktop;
+application/ram=totem.desktop;
+application/sdp=totem.desktop;
+application/smil=totem.desktop;
+application/x-extension-m4a=totem.desktop;
+application/x-extension-mp4=totem.desktop;
+application/x-flac=totem.desktop;
+application/x-flash-video=totem.desktop;
+application/x-matroska=totem.desktop;
+application/x-netshow-channel=totem.desktop;
+application/x-ogg=totem.desktop;rhythmbox.desktop;
+application/x-quicktime-media-link=totem.desktop;
+application/x-quicktimeplayer=totem.desktop;
+application/x-shorten=totem.desktop;
+application/x-smil=totem.desktop;
+application/xspf+xml=totem.desktop;
+audio/3gpp=totem.desktop;
+audio/ac3=totem.desktop;
+audio/AMR=totem.desktop;
+audio/AMR-WB=totem.desktop;
+audio/basic=totem.desktop;
+audio/mp4=totem.desktop;
+audio/mpeg=totem.desktop;rhythmbox.desktop;
+audio/mpegurl=totem.desktop;
+audio/ogg=totem.desktop;
+audio/x-ape=totem.desktop;
+audio/x-flac=totem.desktop;rhythmbox.desktop;
+audio/x-it=totem.desktop;
+audio/x-m4a=totem.desktop;
+audio/x-matroska=totem.desktop;
+audio/x-mod=totem.desktop;
+audio/x-mp3=totem.desktop;rhythmbox.desktop;
+audio/x-mpeg=totem.desktop;rhythmbox.desktop;
+audio/x-mpegurl=totem.desktop;rhythmbox.desktop;
+audio/x-ms-asf=totem.desktop;
+audio/x-ms-asx=totem.desktop;
+audio/x-ms-wax=totem.desktop;
+audio/x-ms-wma=totem.desktop;
+audio/x-musepack=totem.desktop;
+audio/x-pn-aiff=totem.desktop;
+audio/x-pn-au=totem.desktop;
+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-tta=totem.desktop;
+audio/x-wav=totem.desktop;
+audio/x-wavpack=totem.desktop;
+audio/x-vorbis=totem.desktop;
+audio/x-xm=totem.desktop;
+image/x-pict=totem.desktop;
+misc/ultravox=totem.desktop;
+text/google-video-pointer=totem.desktop;
+text/x-google-video-pointer=totem.desktop;
+video/3gpp=totem.desktop;
+video/dv=totem.desktop;
+video/fli=totem.desktop;
+video/flv=totem.desktop;
+video/mp4=totem.desktop;
+video/mp4v-es=totem.desktop;
+video/mpeg=totem.desktop;
+video/msvideo=totem.desktop;
+video/quicktime=totem.desktop;
+video/vivo=totem.desktop;
+video/vnd.divx=totem.desktop;
+video/vnd.vivo=totem.desktop;
+video/x-anim=totem.desktop;
+video/x-avi=totem.desktop;
+video/x-flc=totem.desktop;
+video/x-fli=totem.desktop;
+video/x-flic=totem.desktop;
+video/x-m4v=totem.desktop;
+video/x-matroska=totem.desktop;
+video/x-mpeg=totem.desktop;
+video/x-ms-asf=totem.desktop;
+video/x-msvideo=totem.desktop;
+video/x-ms-wm=totem.desktop;
+video/x-ms-wmv=totem.desktop;
+video/x-ms-wmx=totem.desktop;
+video/x-ms-wvx=totem.desktop;
+video/x-nsv=totem.desktop;
+video/x-ogm+ogg=totem.desktop;
+video/x-theora+ogg=totem.desktop;


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- shared-mime-info.spec	20 Mar 2008 16:48:20 -0000	1.59
+++ shared-mime-info.spec	27 Mar 2008 22:05:11 -0000	1.60
@@ -1,12 +1,15 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.23
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
 Source0: %{name}-%{version}.tar.bz2
 Source1: defaults.list
+# Generated with:
+# for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q $i ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi  ; done
+Source2: totem-defaults.list
 
 Patch0: shared-mime-info-0.16-cisco-vpn.patch
 
@@ -41,6 +44,7 @@
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
+cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 
 ## remove these bogus files
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
@@ -62,6 +66,11 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Mar 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.23-5
+- Make Totem the default for the mime-types it handles (#366101)
+- And make sure Rhythmbox is the second default only for the mime-types
+  it handles
+
 * Thu Mar 20 2008 Matthias Clasen <mclasen at redhat.com> - 0.23-4
 - Change default for rpm to pk-install-file