rpms/amarok/F-10 amarok-2.0.2-fix_lastfm_auth.patch, NONE, 1.1 amarok-2.0.2-no_qtscriptgenerator.patch, NONE, 1.1 amarok.spec, 1.135, 1.136

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.2-fix_lastfm_auth.patch 
	amarok-2.0.2-no_qtscriptgenerator.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* ) ) );

amarok-2.0.2-no_qtscriptgenerator.patch:

--- NEW FILE amarok-2.0.2-no_qtscriptgenerator.patch ---
diff -up amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator amarok-2.0.2/CMakeLists.txt
--- amarok-2.0.2/CMakeLists.txt.no_qtscriptgenerator	2009-03-01 11:36:24.000000000 -0600
+++ amarok-2.0.2/CMakeLists.txt	2009-03-10 13:37:21.000000000 -0500
@@ -20,7 +20,7 @@ set( CMAKE_MODULE_PATH    ${CMAKE_MODULE
 
 #this line has to be before add_defintions, but after the KDE4 cmake includes
 #because they are used to determine install locations
-add_subdirectory( src/scriptengine/generator )
+#add_subdirectory( src/scriptengine/generator )
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 include(CheckLibraryExists)


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- amarok.spec	7 Mar 2009 01:21:14 -0000	1.135
+++ amarok.spec	9 Apr 2009 12:45:13 -0000	1.136
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.2
-Release: 3%{?dist}
+Release: 6%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -15,7 +15,13 @@
 Patch0:  amarok-libgpod-0.7.0.patch
 Patch1:  amarok-2.0.1.1-gcc44.patch
 
+# qtscriptgenerator review, http://bugzilla.redhat.com/489550
+%define no_qtscriptgenerator 1
+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
@@ -35,13 +41,14 @@
 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}}
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%if 0%{?no_qtscriptgenerator}
+BuildRequires: qtscriptgenerator
+Requires: qtscriptbindings
+%endif
 
 Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
@@ -55,15 +62,24 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+
 %prep
 %setup -q
 
-%if 0%{?fedora} > 10
+%if "%(pkg-config --modversion libgpod-1.0)" >=  "0.7.0"
 %patch0 -p0 -b .libgpod-0.7.0
-%patch100 -p0 -b .qt45
 %endif
+
 %patch1 -p1 -b .gcc4
 
+%if 0%{?no_qtscriptgenerator}
+%patch2 -p1 -b .no_qtscriptgenerator
+rm -rf src/scriptengine/generator
+%else
+%{?_qt45:%patch100 -p0 -b .qt45}
+%endif
+%patch101 -p0 -b .fix_lastfm_auth
+
 
 %build
 mkdir -p %{_target_platform}
@@ -71,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}
 
 
@@ -86,31 +95,35 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# desktop files
-desktop-file-install  --vendor "" \
-  --dir %{buildroot}%{_kde4_datadir}/applications/kde4 \
-  --delete-original \
-  %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
-
-%find_lang amarok || touch amarok.lang
+%find_lang amarok
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud}.so
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/amarok.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files -f amarok.lang
@@ -122,13 +135,15 @@
 %{_kde4_appsdir}/desktoptheme/amarok-default.desktop
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_configdir}/*
-%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_datadir}/applications/kde4/amarok.desktop
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
+%if ! 0%{?no_qtscriptgenerator}
 %{_kde4_libdir}/kde4/plugins/script/*.so
+%endif
 %{_kde4_libdir}/libamarok*.so.*
 %{_kde4_libdir}/libamarok_service_liblastfm.so
 %{_kde4_libdir}/strigi/*
@@ -136,6 +151,18 @@
 
 
 %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
+
+* Tue Mar 10 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
+- Req: qtscriptgenerator (f11+) (not enabled, pending review)
+- use desktop-file-validate
+
 * Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-3
 - add minimal qt4,kdelibs4 deps