[rpms/amarok] epel10: - fix mp3 support logic

[Rex Dieter <rdieter@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : d2641f44ecf7df2aeca0d6905936e765e45f6cac
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2010-03-25T17:04:13+00:00
Stats  : +33/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/d2641f44ecf7df2aeca0d6905936e765e45f6cac?branch=epel10

Log:
- fix mp3 support logic

---
diff --git a/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch b/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
new file mode 100644
index 0000000..4f7f695
--- /dev/null
+++ b/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
@@ -0,0 +1,26 @@
+From 50bf5a7e55b08426fd60f4928e65ac066349f83d Mon Sep 17 00:00:00 2001
+From: Bartosz Brachaczek <b.brachaczek@gmail.com>
+Date: Tue, 23 Mar 2010 22:53:13 +0100
+Subject: [PATCH] Fix logic error in EngineController::supportedMimeTypes causing mp3 support misdetection
+
+Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
+---
+ src/EngineController.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/EngineController.cpp b/src/EngineController.cpp
+index 79acb4f..87745ea 100644
+--- a/src/EngineController.cpp
++++ b/src/EngineController.cpp
+@@ -239,7 +239,7 @@ EngineController::supportedMimeTypes()
+     mimeTable << "audio/x-m4b"; // MP4 Audio Books have a different extension that KFileItem/Phonon don't grok
+ 
+     // We special case this, as otherwise the users would hate us
+-    if( ( !mimeTable.contains( "audio/mp3" ) || !mimeTable.contains( "audio/x-mp3" ) ) && !installDistroCodec() )
++    if( ( !mimeTable.contains( "audio/mp3" ) && !mimeTable.contains( "audio/x-mp3" ) ) && !installDistroCodec() )
+     {
+         The::statusBar()->longMessage(
+                 i18n( "<p>Phonon claims it <b>cannot</b> play MP3 files. You may want to examine "
+-- 
+1.6.1
+

diff --git a/amarok.spec b/amarok.spec
index 2649aed..e8815b0 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -16,6 +16,8 @@ Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 # http://bugs.kde.org/227639
 # http://bugs.kde.org/229756
 Patch100: http://gitorious.org/amarok/amarok/commit/a62fed8c667a076daa21fdf8360708813f1bf9e0.patch
+# fix mp3-support detection logic
+Patch101: http://gitorious.org/amarok/amarok/commit/50bf5a7e55b08426fd60f4928e65ac066349f83d.patch
 # may need to rebase this, for building with qt-4.7
 # http://gitorious.org/amarok/amarok/commit/aa5ca5d179d084e99c8a477084ba717c35aa5030
 
@@ -88,6 +90,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %patch50 -p1 -b .qtscript_not_required
 
 %patch100 -p1 -b .info_applet_workaround 
+%patch101 -p1 -b .mp3_support_logic
 
 
 %build
@@ -180,6 +183,9 @@ fi
 
 
 %changelog
+* Thu Mar 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.0-5
+- fix mp3 support logic
+
 * Mon Mar 22 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.3.0-4
 - rebuild (libgpod)