rpms/amarok/devel amarok-2.0.2-fix_lastfm_auth.patch, NONE, 1.1 amarok.spec, 1.144, 1.145

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25331

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.2-fix_lastfm_auth.patch 
Log Message:
* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
- fix lastfm (kdebug#188678, rhbz#494871)
- fix qtscriptgenerator/qtscriptbindings deps


amarok-2.0.2-fix_lastfm_auth.patch:

--- NEW FILE amarok-2.0.2-fix_lastfm_auth.patch ---
--- 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* ) ) );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- amarok.spec	7 Apr 2009 19:07:34 -0000	1.144
+++ amarok.spec	8 Apr 2009 17:09:13 -0000	1.145
@@ -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 @@
 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: 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 @@
  - 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 @@
 %else
 %{?_qt45:%patch100 -p0 -b .qt45}
 %endif
+%patch101 -p0 -b .fix_lastfm_auth
 
 
 %build
@@ -83,13 +87,6 @@
 %{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 @@
 
 
 %changelog
+* Wed Apr 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-6
+- fix lastfm (kdebug#188678, rhbz#494871)
+- fix qtscriptgenerator/qtscriptbindings deps
+
 * Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-5
 - enable external qtscriptgenerator/qtscriptbindings
 - optimize scriptlets