rpms/shared-mime-info/devel defaults.list, 1.16, 1.17 shared-mime-info.spec, 1.53, 1.54

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Mon Nov 05 2007 - Bastien Nocera <bnocera at redhat.com> - 0.22-4
- Make Totem the default for the mime-types it handles (#366101)



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- defaults.list	21 Aug 2007 10:09:44 -0000	1.16
+++ defaults.list	5 Nov 2007 10:59:42 -0000	1.17
@@ -65,12 +65,6 @@
 application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop
 application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop
 application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop
-application/ogg=realplay.desktop
-audio/x-mp3=realplay.desktop
-audio/x-mp3-playlist=realplay.desktop
-audio/x-mpeg=realplay.desktop
-audio/x-flac=rhythmbox.desktop
-audio/x-wav=rhythmbox.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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- shared-mime-info.spec	24 Aug 2007 13:25:52 -0000	1.53
+++ shared-mime-info.spec	5 Nov 2007 10:59:42 -0000	1.54
@@ -1,12 +1,15 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.22
-Release: 3%{?dist}
+Release: 4%{?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 echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; 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,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Nov 05 2007 - Bastien Nocera <bnocera at redhat.com> - 0.22-4
+- Make Totem the default for the mime-types it handles (#366101)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.22-3
 - Rebuild for PPC toolchain bug
 - BuildRequires: gawk