[rpms/amarok] epel10.2: - recognize audio/flac mimetype too (kde#257488)

[Rex Dieter <rdieter@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 90714196c4803510b4adb6a30d0a1f04a6b0e1a0
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-11-30T07:34:14-06:00
Stats  : +31/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/90714196c4803510b4adb6a30d0a1f04a6b0e1a0?branch=epel10.2

Log:
- recognize audio/flac mimetype too (kde#257488)

---
diff --git a/amarok-2.3.2-flac_mimetype.patch b/amarok-2.3.2-flac_mimetype.patch
new file mode 100644
index 0000000..bff7b7d
--- /dev/null
+++ b/amarok-2.3.2-flac_mimetype.patch
@@ -0,0 +1,27 @@
+Newer shared-mime-info (ie, on fedora 14) treats audio/flac as primary mimetype
+(esp when using phonon-backend-gstreamer)
+
+diff -up amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp.flac_mime amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp
+--- amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp.flac_mime	2010-09-15 16:24:11.000000000 -0500
++++ amarok-2.3.2/shared/taglib_filetype_resolvers/mimefiletyperesolver.cpp	2010-11-30 06:48:09.325424753 -0600
+@@ -87,7 +87,7 @@ TagLib::File *MimeFileTypeResolver::crea
+     {
+         return new TagLib::RIFF::AIFF::File(fileName, readProperties, propertiesStyle);
+     }
+-    else if( mimetype->is( "audio/x-flac" ) )
++    else if( mimetype->is( "audio/x-flac" ) || mimetype->is( "audio/flac" ) )
+     {
+         return new TagLib::FLAC::File(fileName, readProperties, propertiesStyle);
+     }
+diff -up amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp.flac_mime amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp
+--- amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp.flac_mime	2010-09-15 16:24:11.000000000 -0500
++++ amarok-2.3.2/src/core-impl/collections/umscollection/handler/UmsHandler.cpp	2010-11-30 06:48:31.899424125 -0600
+@@ -188,7 +188,7 @@ UmsHandler::init()
+             << "mp4" << "mp2" << "ac3";
+ 
+ */
+-    m_mimetypes << "audio/mpeg" << "audio/x-wav" << "video/x-ms-asf" << "audio/x-flac"
++    m_mimetypes << "audio/mpeg" << "audio/x-wav" << "video/x-ms-asf" << "audio/x-flac" << "audio/flac"
+             << "audio/x-ms-wma" << "application/ogg" << "audio/mp4" << "audio/mp4a-latm"
+             << "video/mp4" << "audio/ac3";
+ 

diff --git a/amarok.spec b/amarok.spec
index 80026e2..08e8fdd 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,7 +6,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -192,6 +192,9 @@ fi
 
 
 %changelog
+* Tue Nov 30 2010 Rex Dieter <rdieter@fedoraproject.org> 2.3.2-7
+- recognize audio/flac mimetype too (kde#257488)
+
 * Fri Nov 05 2010 Thomas Janssen <thomasj@fedoraproject.org> 2.3.2-6
 - rebuild for new libxml2