[rpms/amarok] epel10.2: - dynamic mode floods playlist ... (kde #148317)

[rpms/amarok] epel10.2: - dynamic mode floods playlist ... (kde #148317)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 50bf2c8f3451e04583a0fe2191bd8a26c10deb19
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2007-11-21T17:26:50+00:00
Stats  : +22/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/50bf2c8f3451e04583a0fe2191bd8a26c10deb19?branch=epel10.2

Log:
- dynamic mode floods playlist ... (kde #148317)

---
diff --git a/amarok-1.4.7-148317.patch b/amarok-1.4.7-148317.patch
new file mode 100644
index 0000000..e6bf51b
--- /dev/null
+++ b/amarok-1.4.7-148317.patch
@@ -0,0 +1,14 @@
+--- 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 )
+             {

diff --git a/amarok.spec b/amarok.spec
index 5474f69..e47641d 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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 @@ Patch0:     amarok-1.4.7-147126.patch
 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 @@ use any of xmms' visualisation plugins with Amarok.
 %patch0 -p0 -b .147126
 %patch1 -p1 -b .utf8
 %patch2 -p1 -b .xdg
+%patch3 -p4 -b .148317
 
 
 
@@ -252,6 +256,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %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@pobox.com> 1.4.7-10
 - rebuild for libgpod-0.6.0