rpms/amarok/devel amarok-1.4.7-148317.patch, NONE, 1.1 amarok.spec, 1.90, 1.91

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17162

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-148317.patch 
Log Message:
* Wed Nov 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-11
- dynamic mode floods playlist ... (kde #148317)


amarok-1.4.7-148317.patch:

--- NEW FILE amarok-1.4.7-148317.patch ---
--- branches/stable/extragear/multimedia/amarok/src/playlist.cpp	2007/08/28 03:23:02	705493
+++ branches/stable/extragear/multimedia/amarok/src/playlist.cpp	2007/08/28 03:25:34	705494
@@ -1227,7 +1227,10 @@
     }
     else
     {
-        if ( !AmarokConfig::randomMode() || m_prevTracks.count() <= 1 )
+        if( dynamicMode() )
+        {
+        }
+        else if( !AmarokConfig::randomMode() || m_prevTracks.count() <= 1 )
         {
             if( item )
             {


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- amarok.spec	21 Nov 2007 17:22:47 -0000	1.90
+++ amarok.spec	21 Nov 2007 17:26:50 -0000	1.91
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.7
-Release:    10%{?dist}
+Release:    11%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -18,6 +18,9 @@
 Patch1:     amarok-1.4.7-utf8.patch
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
+# http://bugs.kde.org/148317 - dynamic mode floods playlist ...
+# http://websvn.kde.org/branches/stable/extragear/multimedia/amarok/src/playlist.cpp?r1=705494&r2=705493&pathrev=705494&view=patch
+Patch3:     amarok-1.4.7-148317.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -100,6 +103,7 @@
 %patch0 -p0 -b .147126
 %patch1 -p1 -b .utf8
 %patch2 -p1 -b .xdg
+%patch3 -p4 -b .148317
 
 
 
@@ -252,6 +256,9 @@
 
 
 %changelog
+* Wed Nov 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-11
+- dynamic mode floods playlist ... (kde #148317)
+
 * Wed Nov 21 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-10
 - rebuild for libgpod-0.6.0