rpms/amarok/F-11 50bf5a7e55b08426fd60f4928e65ac066349f83d.patch, NONE, 1.1 amarok.spec, 1.164, 1.165

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30255

Modified Files:
	amarok.spec 
Added Files:
	50bf5a7e55b08426fd60f4928e65ac066349f83d.patch 
Log Message:
* Thu Mar 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-5
- fix mp3 support logic


50bf5a7e55b08426fd60f4928e65ac066349f83d.patch:
 EngineController.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 50bf5a7e55b08426fd60f4928e65ac066349f83d.patch ---
>From 50bf5a7e55b08426fd60f4928e65ac066349f83d Mon Sep 17 00:00:00 2001
From: Bartosz Brachaczek <b.brachaczek at 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 at 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



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- amarok.spec	22 Mar 2010 16:17:54 -0000	1.164
+++ amarok.spec	25 Mar 2010 19:04:05 -0000	1.165
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.3.0
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -16,6 +16,8 @@ Patch50: amarok-2.2.1.90-qtscript_not_re
 # 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,7 +183,13 @@ fi
 
 
 %changelog
-* Mon Mar 22 2010 Rex Dietr <rdieter at fedoraproject.org>  - 2.3.0-3
+* Thu Mar 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-5
+- fix mp3 support logic
+
+* Mon Mar 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-4
+- rebuild (libgpod) 
+
+* Mon Mar 22 2010 Rex Dieter <rdieter at fedoraproject.org>  - 2.3.0-3
 - workaround info applet crasher (kde#227639,kde#229756)
 
 * Thu Mar 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-2