[rpms/amarok] epel10.2: - fix lastfm (kdebug#188678, rhbz#494871)

[Rex Dieter <rdieter@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 4148d77724ea33a58485c0e68b598a4d4cb57cc7
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2009-04-08T17:09:13+00:00
            Stats  : +45/-10 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/4148d77724ea33a58485c0e68b598a4d4cb57cc7?branch=epel10.2

            Log:
            - fix lastfm (kdebug#188678, rhbz#494871)
- fix qtscriptgenerator/qtscriptbindings deps

---
diff --git a/amarok-2.0.2-fix_lastfm_auth.patch b/amarok-2.0.2-fix_lastfm_auth.patch
new file mode 100644
index 0000000..cb47d0a
--- /dev/null
+++ b/amarok-2.0.2-fix_lastfm_auth.patch
@@ -0,0 +1,34 @@
+--- src/services/lastfm/LastFmServiceSettings.cpp
++++ src/services/lastfm/LastFmServiceSettings.cpp
+@@ -94,14 +94,12 @@
+     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
+ 
+     QString authToken =  md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
+-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
+     
+     // now authenticate w/ last.fm and get our session key
+     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
+     .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
+     .add( "authToken", authToken )
+     .add( "api_key", Ws::ApiKey )
+-    .add( "api_sig", sign_key )
+     .get();
+     
+     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
+--- src/services/lastfm/LastFmService.cpp
++++ src/services/lastfm/LastFmService.cpp
+@@ -115,14 +115,12 @@
+     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
+ 
+     QString authToken =  md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
+-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
+     
+     // now authenticate w/ last.fm and get our session key
+     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
+     .add( "username", m_userName )
+     .add( "authToken", authToken )
+     .add( "api_key", Ws::ApiKey )
+-    .add( "api_sig", sign_key )
+     .get();
+     
+     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );

diff --git a/amarok.spec b/amarok.spec
index a30076b..142ad31 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -20,6 +20,8 @@ Patch1:  amarok-2.0.1.1-gcc44.patch
 Patch2:  amarok-2.0.2-no_qtscriptgenerator.patch
 
 Patch100: amarok-2.0.1.1-qt45.patch
+# https://bugs.kde.org/188678
+Patch101: amarok-2.0.2-fix_lastfm_auth.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -39,13 +41,13 @@ BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 
-# 
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
 
 %if 0%{?no_qtscriptgenerator}
-Requires: qtscriptgenerator
+BuildRequires: qtscriptgenerator
+Requires: qtscriptbindings
 %endif
 
 Obsoletes: amarok-devel < 1.4.9 
@@ -60,6 +62,7 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+
 %prep
 %setup -q
 
@@ -75,6 +78,7 @@ rm -rf src/scriptengine/generator
 %else
 %{?_qt45:%patch100 -p0 -b .qt45}
 %endif
+%patch101 -p0 -b .fix_lastfm_auth
 
 
 %build
@@ -83,13 +87,6 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-%if 0
-# hack around qt45 patch-induced(?) smp borkage
-pushd src/scriptengine/generator/generator
-./generate.sh
-popd
-%endif
-
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -154,6 +151,10 @@ fi
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter@fedoraproject.org> 2.0.2-6
+- fix lastfm (kdebug#188678, rhbz#494871)
+- fix qtscriptgenerator/qtscriptbindings deps
+
 * Tue Apr 07 2009 Rex Dieter <rdieter@fedoraproject.org> 2.0.2-5
 - enable external qtscriptgenerator/qtscriptbindings
 - optimize scriptlets