public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/amarok] epel10: 2.6.90
@ 2026-07-06 18:05 Rex Dieter
0 siblings, 0 replies; only message in thread
From: Rex Dieter @ 2026-07-06 18:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/amarok
Branch : epel10
Commit : f922ba2ca3de1c5ac039c6b635ffa560e1dcc49d
Author : Rex Dieter <rdieter@math.unl.edu>
Date : 2012-12-14T11:32:45-06:00
Stats : +119/-839 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/f922ba2ca3de1c5ac039c6b635ffa560e1dcc49d?branch=epel10
Log:
2.6.90
---
diff --git a/.gitignore b/.gitignore
index a5a815f..000519c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/amarok-2.6.0.tar.bz2
/amarok-fr_po.patch.bz2
+/amarok-2.6.90.tar.bz2
diff --git a/amarok-2.2.1.90-qtscript_not_required.patch b/amarok-2.2.1.90-qtscript_not_required.patch
deleted file mode 100644
index 111c52b..0000000
--- a/amarok-2.2.1.90-qtscript_not_required.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required amarok-2.2.1.90/CMakeLists.txt
---- amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required 2009-12-10 04:45:37.000000000 -0600
-+++ amarok-2.2.1.90/CMakeLists.txt 2009-12-10 09:42:21.253183224 -0600
-@@ -75,8 +75,8 @@ if( WITH_PLAYER )
-
- macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.3.0" "" )
-
-- find_package( QtScriptQtBindings REQUIRED )
-- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
-+ macro_optional_find_package( QtScriptQtBindings )
-+ macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
-
- add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
diff --git a/amarok-2.5.0-onlinedoc.patch b/amarok-2.5.0-onlinedoc.patch
deleted file mode 100644
index dc731d4..0000000
--- a/amarok-2.5.0-onlinedoc.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionClasses.cpp
---- amarok-2.5.0/src/ActionClasses.cpp 2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0-onlinedoc/src/ActionClasses.cpp 2012-01-29 08:23:50.000000000 +0100
-@@ -31,10 +31,12 @@
- #include "playlist/PlaylistActions.h"
- #include "playlist/PlaylistModelStack.h"
-
-+#include <QFile>
- #include <KAuthorized>
- #include <KHelpMenu>
- #include <KLocale>
- #include <KToolBar>
-+#include <KToolInvocation>
- #include <Osd.h>
- #include <EqualizerDialog.h>
-
-@@ -63,6 +65,7 @@
- using namespace Amarok;
-
- KHelpMenu *Menu::s_helpMenu = 0;
-+OnlineHelpHandler *Menu::s_onlineHelpHandler = 0;
-
- static void
- safePlug( KActionCollection *ac, const char *name, QWidget *w )
-@@ -152,6 +155,20 @@
-
- KMenu* menu = s_helpMenu->menu();
-
-+ // If amarok-doc is not installed, bring up the online version instead.
-+ if ( !QFile::exists( "/usr/share/doc/HTML/en/amarok/index.docbook" ) ) {
-+ QAction *contentsAction = s_helpMenu->action( KHelpMenu::menuHelpContents );
-+ // disconnect the default slot which fires up KHelpCenter
-+ disconnect( contentsAction, SIGNAL(triggered(bool)), s_helpMenu, SLOT(appHelpActivated()) );
-+ if ( s_onlineHelpHandler == 0 )
-+ s_onlineHelpHandler = new OnlineHelpHandler( parent );
-+ else
-+ // ensure no duplicate connection
-+ disconnect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
-+ // connect our custom slot which fires up a browser on UserBase instead
-+ connect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
-+ }
-+
- // NOTE: We hide "Report Bug..." because we need to add it on our own to name the dialog
- // so it can be blacklisted from LikeBack.
- s_helpMenu->action( KHelpMenu::menuReportBug )->setVisible( false );
-@@ -164,6 +181,17 @@
- return menu;
- }
-
-+OnlineHelpHandler::OnlineHelpHandler( QObject* parent )
-+ : QObject( parent )
-+{
-+}
-+
-+void
-+OnlineHelpHandler::onlineHelpActivated()
-+{
-+ KToolInvocation::invokeBrowser( "http://userbase.kde.org/Amarok/Manual" );
-+}
-+
- //////////////////////////////////////////////////////////////////////////////////////////
- // PlayPauseAction
- //////////////////////////////////////////////////////////////////////////////////////////
-diff -ur amarok-2.5.0/src/ActionClasses.h amarok-2.5.0-onlinedoc/src/ActionClasses.h
---- amarok-2.5.0/src/ActionClasses.h 2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0-onlinedoc/src/ActionClasses.h 2012-01-29 08:08:13.000000000 +0100
-@@ -34,6 +34,16 @@
-
- namespace Amarok
- {
-+ class OnlineHelpHandler : public QObject
-+ {
-+ Q_OBJECT
-+ public:
-+ OnlineHelpHandler( QObject* parent );
-+
-+ public slots:
-+ void onlineHelpActivated();
-+ };
-+
- class Menu : public KMenu
- {
- Q_OBJECT
-@@ -45,6 +55,7 @@
- private:
- static Menu *s_instance;
- static KHelpMenu *s_helpMenu;
-+ static OnlineHelpHandler *s_onlineHelpHandler;
- };
-
- class MenuAction : public KAction
diff --git a/amarok-2.5.96-liblastfm1.patch b/amarok-2.5.96-liblastfm1.patch
deleted file mode 100644
index 3881559..0000000
--- a/amarok-2.5.96-liblastfm1.patch
+++ /dev/null
@@ -1,706 +0,0 @@
-diff -up amarok-2.5.96/CMakeLists.txt.liblastfm1 amarok-2.5.96/CMakeLists.txt
---- amarok-2.5.96/CMakeLists.txt.liblastfm1 2012-07-31 05:17:20.000000000 -0500
-+++ amarok-2.5.96/CMakeLists.txt 2012-08-02 07:52:13.653187743 -0500
-@@ -129,7 +129,7 @@ if( WITH_PLAYER )
- # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
-
- macro_optional_find_package(LibLastFm)
-- macro_log_feature( LIBLASTFM_FOUND "liblastfm" "Enable Last.Fm service, including scrobbling, song submissions, and suggested song dynamic playlists" "http://cdn.last.fm/src/liblastfm-0.3.0.tar.bz2" FALSE "" "version 0.3.x (versions 1.0 or higher are incompatible)" )
-+ macro_log_feature( LIBLASTFM_FOUND "liblastfm" "Enable Last.Fm service, including scrobbling, song submissions, and suggested song dynamic playlists" "http://cdn.last.fm/src/liblastfm-1.0.0.tar.gz" FALSE "1.0.0" "" )
- macro_bool_to_01( LIBLASTFM_FOUND HAVE_LIBLASTFM )
-
- macro_optional_find_package( FFmpeg )
-diff -up amarok-2.5.96/cmake/modules/FindLibLastFm.cmake.liblastfm1 amarok-2.5.96/cmake/modules/FindLibLastFm.cmake
---- amarok-2.5.96/cmake/modules/FindLibLastFm.cmake.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/cmake/modules/FindLibLastFm.cmake 2012-08-02 07:38:24.317555869 -0500
-@@ -6,7 +6,7 @@
- # LIBLASTFM_FOUND, whether liblastfm was found
-
-
--find_path(LIBLASTFM_INCLUDE_DIR NAMES Audioscrobbler
-+find_path(LIBLASTFM_INCLUDE_DIR NAMES lastfm
- HINTS
- ~/usr/include
- /opt/local/include
-diff -up amarok-2.5.96/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp.liblastfm1 amarok-2.5.96/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp
---- amarok-2.5.96/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp 2012-08-02 07:38:24.301556068 -0500
-@@ -27,10 +27,6 @@
- #include "EngineController.h"
- #include "LastFmEventXmlParser.h"
-
--// LastFm
--#include <lastfm/XmlQuery>
--#include <lastfm/ws.h>
--
- // KDE
- #include <KDateTime>
-
-diff -up amarok-2.5.96/src/core/support/Amarok.h.liblastfm1 amarok-2.5.96/src/core/support/Amarok.h
---- amarok-2.5.96/src/core/support/Amarok.h.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/core/support/Amarok.h 2012-08-02 07:38:24.301556068 -0500
-@@ -203,6 +203,7 @@ namespace Amarok
-
- inline const char* discogsApiKey() { return "91734dd989"; }
- inline const char* lastfmApiKey() { return "402d3ca8e9bc9d3cf9b85e1202944ca5"; }
-+ inline const char* lastfmApiSharedSecret() { return "fe0dcde9fcd14c2d1d50665b646335e9"; }
- inline const char* yahooBossApiKey() { return "oQepTNrV34G9Satb1dgRZ8hdl1uhJvguDSU5Knl2Xd4ALK85knYt6ylr.FTA57XMRBA-"; }
- inline const char* flickrApiKey() { return "9c5a288116c34c17ecee37877397fe31"; }
- }
-diff -up amarok-2.5.96/src/LastfmReadLabelCapability.cpp.liblastfm1 amarok-2.5.96/src/LastfmReadLabelCapability.cpp
---- amarok-2.5.96/src/LastfmReadLabelCapability.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/LastfmReadLabelCapability.cpp 2012-08-02 07:38:24.318555856 -0500
-@@ -22,8 +22,7 @@
- #include <QMap>
- #include <QNetworkReply>
-
--#include <lastfm/XmlQuery>
--#include <ws.h>
-+#include <lastfm/XmlQuery.h>
- #include "core/support/Amarok.h"
-
- namespace Capabilities
-@@ -72,7 +71,8 @@ LastfmReadLabelCapability::onTagsFetched
- {
- case QNetworkReply::NoError:
- {
-- lastfm::XmlQuery lfm = m_job->readAll();
-+ lastfm::XmlQuery lfm;
-+ lfm.parse(m_job->readAll());
- QList<lastfm::XmlQuery> tags = lfm.children( "tag" );
- QStringList ret;
- foreach( const lastfm::XmlQuery &child, tags )
-diff -up amarok-2.5.96/src/services/ampache/LastfmInfoParser.cpp.liblastfm1 amarok-2.5.96/src/services/ampache/LastfmInfoParser.cpp
---- amarok-2.5.96/src/services/ampache/LastfmInfoParser.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/ampache/LastfmInfoParser.cpp 2012-08-02 07:38:24.296556129 -0500
-@@ -20,8 +20,7 @@
- #include "core/support/Amarok.h"
- #include "core/support/Debug.h"
-
--#include <lastfm/XmlQuery>
--#include <lastfm/ws.h>
-+#include <lastfm/XmlQuery.h>
-
- #include <KLocale>
-
-@@ -55,7 +54,8 @@ void LastfmInfoParser::onGetTrackInfo()
- {
- case QNetworkReply::NoError:
- {
-- lastfm::XmlQuery lfm = m_jobs[ "getTrackInfo" ]->readAll();
-+ lastfm::XmlQuery lfm;
-+ lfm.parse( m_jobs[ "getTrackInfo" ]->readAll() );
- lastfm::XmlQuery wiki = lfm["track"]["wiki"];
- const QString contentText = wiki["content"].text();
- const QString publishedDate = wiki["published"].text();
-@@ -103,7 +103,8 @@ void LastfmInfoParser::onGetAlbumInfo()
- {
- case QNetworkReply::NoError:
- {
-- lastfm::XmlQuery lfm = m_jobs[ "getAlbumInfo" ]->readAll();
-+ lastfm::XmlQuery lfm;
-+ lfm.parse( m_jobs[ "getAlbumInfo" ]->readAll() );
- lastfm::XmlQuery wiki = lfm["album"]["wiki"];
- const QString summaryText = wiki["summary"].text();
- const QString contentText = wiki["content"].text();
-@@ -155,7 +156,8 @@ void LastfmInfoParser::onGetArtistInfo()
- {
- case QNetworkReply::NoError:
- {
-- lastfm::XmlQuery lfm = m_jobs[ "getArtistInfo" ]->readAll();
-+ lastfm::XmlQuery lfm;
-+ lfm.parse( m_jobs[ "getArtistInfo" ]->readAll() );
- debug() << lfm.text();
- lastfm::XmlQuery bio = lfm["artist"]["bio"];
- const QString summaryText = bio["summary"].text();
-diff -up amarok-2.5.96/src/services/lastfm/biases/LastFmBias.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/biases/LastFmBias.cpp
---- amarok-2.5.96/src/services/lastfm/biases/LastFmBias.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/biases/LastFmBias.cpp 2012-08-02 07:38:24.299556093 -0500
-@@ -34,9 +34,8 @@
- #include "core/collections/QueryMaker.h"
- #include "core-impl/collections/support/CollectionManager.h"
-
--#include "lastfm/Artist"
--#include "lastfm/ws.h"
--#include "lastfm/XmlQuery"
-+#include <lastfm/Artist.h>
-+#include <lastfm/ws.h>
-
- #include <QLabel>
- #include <QComboBox>
-diff -up amarok-2.5.96/src/services/lastfm/biases/WeeklyTopBias.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/biases/WeeklyTopBias.cpp
---- amarok-2.5.96/src/services/lastfm/biases/WeeklyTopBias.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/biases/WeeklyTopBias.cpp 2012-08-02 07:38:24.299556093 -0500
-@@ -34,9 +34,9 @@
- #include "core/collections/QueryMaker.h"
- #include "core-impl/collections/support/CollectionManager.h"
-
--#include "lastfm/Artist"
--#include "lastfm/ws.h"
--#include "lastfm/XmlQuery"
-+#include <lastfm/Artist.h>
-+#include <lastfm/ws.h>
-+#include <lastfm/XmlQuery.h>
-
- #include <QNetworkReply>
-
-@@ -371,10 +371,9 @@ Dynamic::WeeklyTopBias::weeklyArtistQuer
- }
-
-
-- try
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( reply->readAll() ) )
- {
-- lastfm::XmlQuery lfm( reply->readAll() );
--
- // debug() << "got response:" << lfm;
- QStringList artists;
- for( int i = 0; i < lfm[ "weeklyartistchart" ].children( "artist" ).size(); i++ )
-@@ -398,10 +397,10 @@ Dynamic::WeeklyTopBias::weeklyArtistQuer
- warning() << "Got a reply for a week"<<week<<"that was not requested.";
- return;
- }
--
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "caught exception parsing weekly artist chart.";
-+ debug() << "failed to parse weekly artist chart.";
- }
-
- reply->deleteLater();
-diff -up amarok-2.5.96/src/services/lastfm/LastFmServiceCollection.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/LastFmServiceCollection.cpp
---- amarok-2.5.96/src/services/lastfm/LastFmServiceCollection.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/LastFmServiceCollection.cpp 2012-08-02 07:38:24.297556117 -0500
-@@ -26,7 +26,7 @@
- #include "core-impl/collections/support/MemoryQueryMaker.h"
-
- #include <lastfm/ws.h>
--#include <lastfm/XmlQuery>
-+#include <lastfm/XmlQuery.h>
-
- #include <QNetworkReply>
-
-@@ -154,10 +154,9 @@ void LastFmServiceCollection::slotAddNei
- case QNetworkReply::NoError:
- {
- // iterate through each neighbour
-- try
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "user.getNeighbours" ]->readAll() ) )
- {
-- lastfm::XmlQuery lfm( m_jobs[ "user.getNeighbours" ]->readAll() );
--
- foreach( const lastfm::XmlQuery &e, lfm[ "neighbours" ].children( "user" ) )
- {
- const QString name = e[ "name" ].text();
-@@ -168,9 +167,10 @@ void LastFmServiceCollection::slotAddNei
- addTrack( trackPtr );
- }
-
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- break;
- }
-@@ -195,15 +195,14 @@ void LastFmServiceCollection::slotAddNei
- case QNetworkReply::NoError:
- {
- // iterate through each neighbour
-- try
-+ if( !m_jobs[ "user.getNeighbours" ] )
-+ {
-+ debug() << "BAD! got no result object";
-+ return;
-+ }
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "user.getNeighbours" ]->readAll() ) )
- {
-- if( !m_jobs[ "user.getNeighbours" ] )
-- {
-- debug() << "BAD! got no result object";
-- return;
-- }
-- lastfm::XmlQuery lfm( m_jobs[ "user.getNeighbours" ]->readAll() );
--
- // iterate through each neighbour
- foreach( const lastfm::XmlQuery &e, lfm[ "neighbours" ].children( "user" ) )
- {
-@@ -218,9 +217,10 @@ void LastFmServiceCollection::slotAddNei
-
- // should be safe, as both slots SHOULD get called before we return to the event loop...
- m_jobs[ "user.getNeighbours" ]->deleteLater();
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- break;
- }
-@@ -248,10 +248,9 @@ void LastFmServiceCollection::slotAddFri
- {
- case QNetworkReply::NoError:
- {
-- try
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "user.getFriends" ]->readAll() ) )
- {
-- lastfm::XmlQuery lfm( m_jobs[ "user.getFriends" ]->readAll() );
--
- foreach( const lastfm::XmlQuery &e, lfm[ "friends" ].children( "user" ) )
- {
- const QString name = e[ "name" ].text();
-@@ -261,9 +260,10 @@ void LastFmServiceCollection::slotAddFri
- addTrack( trackPtr );
- }
-
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- break;
- }
-@@ -293,10 +293,9 @@ void LastFmServiceCollection::slotAddFri
- {
- case QNetworkReply::NoError:
- {
-- try
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "user.getFriends" ]->readAll() ) )
- {
-- lastfm::XmlQuery lfm( m_jobs[ "user.getFriends" ]->readAll() );
--
- foreach( const lastfm::XmlQuery &e, lfm[ "friends" ].children( "user" ) )
- {
- const QString name = e[ "name" ].text();
-@@ -306,9 +305,10 @@ void LastFmServiceCollection::slotAddFri
- addTrack( trackPtr );
- }
-
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- break;
- }
-diff -up amarok-2.5.96/src/services/lastfm/LastFmService.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/LastFmService.cpp
---- amarok-2.5.96/src/services/lastfm/LastFmService.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/LastFmService.cpp 2012-08-02 07:38:24.296556129 -0500
-@@ -46,8 +46,8 @@
- #include "widgets/SearchWidget.h"
- #include "NetworkAccessManagerProxy.h"
-
--#include <lastfm/Audioscrobbler> // from liblastfm
--#include <lastfm/XmlQuery>
-+#include <lastfm/Audioscrobbler.h> // from liblastfm
-+#include <lastfm/XmlQuery.h>
-
- #include <KLocale>
- #include <KPasswordDialog>
-@@ -224,10 +224,7 @@ LastFmService::init()
- {
- // set the global static Lastfm::Ws stuff
- lastfm::ws::ApiKey = Amarok::lastfmApiKey();
-- lastfm::ws::SharedSecret = "fe0dcde9fcd14c2d1d50665b646335e9";
-- // testing w/ official keys
-- //Ws::SharedSecret = "73582dfc9e556d307aead069af110ab8";
-- //Ws::ApiKey = "c8c7b163b11f92ef2d33ba6cd3c2c3c3";
-+ lastfm::ws::SharedSecret = Amarok::lastfmApiSharedSecret();
- m_userNameArray = qstrdup( m_userName.toLatin1().data() );
- lastfm::ws::Username = m_userNameArray;
- if( lastfm::nam() != The::networkAccessManager() )
-@@ -309,7 +306,8 @@ LastFmService::onAuthenticated()
- case QNetworkReply::NoError:
- {
-
-- lastfm::XmlQuery lfm = lastfm::XmlQuery( m_jobs[ "auth" ]->readAll() );
-+ lastfm::XmlQuery lfm;
-+ lfm.parse( m_jobs[ "auth" ]->readAll() );
- LastFmServiceConfig config;
-
- if( lfm.children( "error" ).size() > 0 )
-@@ -359,10 +357,8 @@ LastFmService::onGetUserInfo()
- {
- case QNetworkReply::NoError:
- {
-- try
-- {
-- lastfm::XmlQuery lfm( m_jobs[ "getUserInfo" ]->readAll() );
--
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "getUserInfo" ]->readAll() ) ) {
- m_country = lfm["user"]["country"].text();
- m_age = lfm["user"]["age"].text();
- m_gender = lfm["user"]["gender"].text();
-@@ -381,9 +377,10 @@ LastFmService::onGetUserInfo()
- }
- updateProfileInfo();
-
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- break;
- } case QNetworkReply::AuthenticationRequiredError:
-diff -up amarok-2.5.96/src/services/lastfm/LastFmServiceSettings.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/LastFmServiceSettings.cpp
---- amarok-2.5.96/src/services/lastfm/LastFmServiceSettings.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/LastFmServiceSettings.cpp 2012-08-02 07:38:24.297556117 -0500
-@@ -23,9 +23,9 @@
- #include "NetworkAccessManagerProxy.h"
- #include "ui_LastFmConfigWidget.h"
-
--#include <lastfm/Audioscrobbler> // from liblastfm
-+#include <lastfm/Audioscrobbler.h> // from liblastfm
- #include <lastfm/ws.h>
--#include <lastfm/XmlQuery>
-+#include <lastfm/XmlQuery.h>
-
- #include <QCryptographicHash>
- #include <QNetworkAccessManager>
-@@ -100,7 +100,7 @@ LastFmServiceSettings::testLogin()
- m_configDialog->testLogin->setText( i18n( "Testing..." ) );
- // set the global static Lastfm::Ws stuff
- lastfm::ws::ApiKey = Amarok::lastfmApiKey();
-- lastfm::ws::SharedSecret = "fe0dcde9fcd14c2d1d50665b646335e9";
-+ lastfm::ws::SharedSecret = Amarok::lastfmApiSharedSecret();
- lastfm::ws::Username = qstrdup( m_configDialog->kcfg_ScrobblerUsername->text().toLatin1().data() );
- if( lastfm::nam() != The::networkAccessManager() )
- lastfm::setNetworkAccessManager( The::networkAccessManager() );
-@@ -126,7 +126,8 @@ LastFmServiceSettings::onAuthenticated()
- {
- DEBUG_BLOCK
-
-- lastfm::XmlQuery lfm = lastfm::XmlQuery( m_authQuery->readAll() );
-+ lastfm::XmlQuery lfm;
-+ lfm.parse( m_authQuery->readAll() );
-
- switch( m_authQuery->error() )
- {
-diff -up amarok-2.5.96/src/services/lastfm/LastFmTreeModel.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/LastFmTreeModel.cpp
---- amarok-2.5.96/src/services/lastfm/LastFmTreeModel.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/LastFmTreeModel.cpp 2012-08-02 07:38:24.298556105 -0500
-@@ -26,8 +26,8 @@
- #include "AmarokMimeData.h"
-
- #include <lastfm/ws.h>
--#include <lastfm/Tag>
--#include <lastfm/XmlQuery>
-+#include <lastfm/Tag.h>
-+#include <lastfm/XmlQuery.h>
-
- #include <KIcon>
- #include <KLocale>
-@@ -68,11 +68,12 @@ LastFmTreeModel::slotAddNeighbors ()
- {
- DEBUG_BLOCK
-
-- try
-- {
- // Iterate over each neighbor, in two passes: 1) Get data 2) Sort data, store in model
-
-- lastfm::XmlQuery lfm( m_jobs[ "getNeighbours" ]->readAll() );
-+ lastfm::XmlQuery lfm;
-+ lfm.parse( m_jobs[ "getNeighbours" ]->readAll() );
-+ if( lfm.parseError().enumValue() == lastfm::ws::NoError )
-+ {
- foreach( const lastfm::XmlQuery &e, lfm[ "neighbours" ].children ( "user" ) )
- {
- const QString name = e[ "name" ].text();
-@@ -88,11 +89,11 @@ LastFmTreeModel::slotAddNeighbors ()
- appendUserStations( neighbor, name );
- }
- m_neighbors.sort();
-+ } else {
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
-+ return;
- }
-- catch( lastfm::ws::ParseError e )
-- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-- }
-+
- emitRowChanged(LastFm::Neighbors);
- m_jobs[ "getNeighbours" ]->deleteLater();
- }
-@@ -102,11 +103,11 @@ LastFmTreeModel::slotAddFriends ()
- {
- DEBUG_BLOCK
-
-- try
-- {
-- // Iterate over each friend, in two passes: 1) Get data 2) Sort data, store in model
-+ // Iterate over each friend, in two passes: 1) Get data 2) Sort data, store in model
-
-- lastfm::XmlQuery lfm( m_jobs[ "getFriends" ]->readAll() );
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "getFriends" ]->readAll() ) )
-+ {
- foreach( const lastfm::XmlQuery &e, lfm[ "friends" ].children ( "user" ) )
- {
- const QString name = e[ "name" ].text();
-@@ -123,11 +124,11 @@ LastFmTreeModel::slotAddFriends ()
- appendUserStations( afriend, name );
- }
- m_friends.sort();
-+ } else {
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
-+ return;
- }
-- catch( lastfm::ws::ParseError e )
-- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-- }
-+
- emitRowChanged(LastFm::Friends);
- m_jobs[ "getFriends" ]->deleteLater();
- }
-@@ -137,10 +138,9 @@ LastFmTreeModel::slotAddTopArtists ()
- {
- DEBUG_BLOCK
- WeightedStringList list;
-- try
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( m_jobs[ "getTopArtists" ]->readAll() ) )
- {
-- lastfm::XmlQuery lfm( m_jobs[ "getTopArtists" ]->readAll() );
--
- foreach( const lastfm::XmlQuery &e, lfm[ "topartists" ].children ( "artist" ) )
- {
- const QString name = e[ "name" ].text();
-@@ -158,9 +158,10 @@ LastFmTreeModel::slotAddTopArtists ()
- m_myTopArtists->appendChild ( artist );
- }
-
-- } catch( lastfm::ws::ParseError e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- emitRowChanged(LastFm::TopArtists);
- m_jobs[ "getTopArtists" ]->deleteLater();
-diff -up amarok-2.5.96/src/services/lastfm/LastFmTreeModel.h.liblastfm1 amarok-2.5.96/src/services/lastfm/LastFmTreeModel.h
---- amarok-2.5.96/src/services/lastfm/LastFmTreeModel.h.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/LastFmTreeModel.h 2012-08-02 07:38:24.297556117 -0500
-@@ -22,7 +22,7 @@
- #include "core/meta/Meta.h"
- #include "WeightedStringList.h"
-
--#include <lastfm/User>
-+#include <lastfm/User.h>
-
- #include <QAbstractItemModel>
- #include <QHash>
-@@ -136,7 +136,7 @@ private:
- LastFmTreeItem *m_myTopArtists;
-
- QString m_userName;
-- lastfm::AuthenticatedUser m_user;
-+ lastfm::User m_user;
-
- QStringList m_friends;
- QStringList m_neighbors;
-diff -up amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.cpp.liblastfm1 amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.cpp
---- amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.cpp.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.cpp 2012-08-02 07:38:24.300556081 -0500
-@@ -41,7 +41,7 @@
- #include <QWeakPointer>
- #include <QUrl>
-
--#include <lastfm/Track>
-+#include <lastfm/Track.h>
-
- namespace LastFm {
-
-@@ -451,8 +451,7 @@ Track::love()
- DEBUG_BLOCK
-
- debug() << "info:" << d->lastFmTrack.artist() << d->lastFmTrack.title();
-- d->wsReply = lastfm::MutableTrack( d->lastFmTrack ).love();
-- connect( d->wsReply, SIGNAL( finished() ), this, SLOT( slotWsReply() ) );
-+ lastfm::MutableTrack( d->lastFmTrack ).love();
- }
-
- void
-@@ -477,9 +476,9 @@ void Track::slotResultReady()
- {
- if( d->trackFetch->error() == QNetworkReply::NoError )
- {
-- try
-+ lastfm::XmlQuery lfm;
-+ if( lfm.parse( d->trackFetch->readAll() ) )
- {
-- lastfm::XmlQuery lfm( d->trackFetch->readAll() );
- QString id = lfm[ "track" ][ "id" ].text();
- QString streamable = lfm[ "track" ][ "streamable" ].text();
- if( streamable.toInt() == 1 )
-@@ -487,9 +486,10 @@ void Track::slotResultReady()
- else
- init();
-
-- } catch( lastfm::ws::ParseError& e )
-+ }
-+ else
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
- }
- } else
- {
-diff -up amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.h.liblastfm1 amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.h
---- amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.h.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/meta/LastFmMeta.h 2012-08-02 07:38:24.299556093 -0500
-@@ -24,7 +24,7 @@
- #include "ServiceMetaBase.h" // for the SourceInfoProvider
-
-
--#include <lastfm/Track>
-+#include <lastfm/Track.h>
-
-
- #include <QObject>
-diff -up amarok-2.5.96/src/services/lastfm/meta/LastFmMeta_p.h.liblastfm1 amarok-2.5.96/src/services/lastfm/meta/LastFmMeta_p.h
---- amarok-2.5.96/src/services/lastfm/meta/LastFmMeta_p.h.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/meta/LastFmMeta_p.h 2012-08-02 07:38:24.300556081 -0500
-@@ -26,10 +26,10 @@
- #include "core/statistics/StatisticsProvider.h"
- #include "core-impl/statistics/providers/tag/TagStatisticsProvider.h"
-
--#include <lastfm/Track>
-+#include <lastfm/Track.h>
- #include <lastfm/ws.h>
--#include <lastfm/RadioTuner>
--#include <lastfm/XmlQuery>
-+#include <lastfm/RadioTuner.h>
-+#include <lastfm/XmlQuery.h>
-
- #include <kio/job.h>
- #include <kio/jobclasses.h>
-@@ -144,26 +144,24 @@ class Track::Private : public QObject
- return;
- if( m_userFetch->error() == QNetworkReply::NoError )
- {
-- try
-+ lastfm::XmlQuery lfm;
-+ if( !lfm.parse( m_userFetch->readAll() ) )
- {
-- lastfm::XmlQuery lfm( m_userFetch->readAll() );
-- albumUrl = lfm[ "track" ][ "album" ][ "url" ].text();
-- trackUrl = lfm[ "track" ][ "url" ].text();
-- artistUrl = lfm[ "track" ][ "artist" ][ "url" ].text();
--
-- notifyObservers();
--
-- imageUrl = lfm[ "track" ][ "album" ][ "image size=large" ].text();
--
-- if( !imageUrl.isEmpty() )
-- {
-- KIO::Job* job = KIO::storedGet( KUrl( imageUrl ), KIO::Reload, KIO::HideProgressInfo );
-- connect( job, SIGNAL( result( KJob* ) ), this, SLOT( fetchImageFinished( KJob* ) ) );
-- }
-+ debug() << "Got exception in parsing from last.fm:" << lfm.parseError().message();
-+ return;
-+ }
-+ albumUrl = lfm[ "track" ][ "album" ][ "url" ].text();
-+ trackUrl = lfm[ "track" ][ "url" ].text();
-+ artistUrl = lfm[ "track" ][ "artist" ][ "url" ].text();
-+
-+ notifyObservers();
-+
-+ imageUrl = lfm[ "track" ][ "album" ][ "image size=large" ].text();
-
-- } catch( lastfm::ws::ParseError& e )
-+ if( !imageUrl.isEmpty() )
- {
-- debug() << "Got exception in parsing from last.fm:" << e.what();
-+ KIO::Job* job = KIO::storedGet( KUrl( imageUrl ), KIO::Reload, KIO::HideProgressInfo );
-+ connect( job, SIGNAL( result( KJob* ) ), this, SLOT( fetchImageFinished( KJob* ) ) );
- }
- }
-
-diff -up amarok-2.5.96/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h.liblastfm1 amarok-2.5.96/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h
---- amarok-2.5.96/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/meta/MultiPlayableCapabilityImpl_p.h 2012-08-02 07:38:24.301556068 -0500
-@@ -25,8 +25,9 @@
- #include "core/meta/Meta.h"
- #include "core/capabilities/MultiPlayableCapability.h"
-
--#include <lastfm/Track>
--#include <lastfm/RadioTuner>
-+#include <lastfm/Track.h>
-+#include <lastfm/RadioStation.h>
-+#include <lastfm/RadioTuner.h>
- #include <lastfm/ws.h>
-
- #include <KLocale>
-@@ -55,24 +56,23 @@ class MultiPlayableCapabilityImpl : publ
- {
- DEBUG_BLOCK
- m_tuner = new lastfm::RadioTuner( lastfm::RadioStation( m_track->uidUrl() ) );
--
-+
- connect( m_tuner, SIGNAL( trackAvailable() ), this, SLOT( slotNewTrackAvailable() ) );
-- connect( m_tuner, SIGNAL( error( lastfm::ws::Error ) ), this, SLOT( error( lastfm::ws::Error ) ) );
-+ connect( m_tuner, SIGNAL( error(lastfm::ws::Error,QString) ), this, SLOT( error( lastfm::ws::Error ) ) );
- }
--
-+
- virtual void fetchNext()
- {
- DEBUG_BLOCK
- m_currentTrack = m_tuner->takeNextTrack();
- m_track->setTrackInfo( m_currentTrack );
--
- }
--
-+
- using Observer::metadataChanged;
- virtual void metadataChanged( Meta::TrackPtr track )
- {
- const LastFm::TrackPtr ltrack = LastFm::TrackPtr::dynamicCast( track );
--
-+
- if( ltrack.isNull() )
- return;
-
-@@ -94,7 +94,7 @@ class MultiPlayableCapabilityImpl : publ
- m_track->setTrackInfo( m_currentTrack );
- }
- }
--
-+
- virtual void skip()
- {
- fetchNext();
-diff -up amarok-2.5.96/src/services/lastfm/ScrobblerAdapter.h.liblastfm1 amarok-2.5.96/src/services/lastfm/ScrobblerAdapter.h
---- amarok-2.5.96/src/services/lastfm/ScrobblerAdapter.h.liblastfm1 2012-07-31 05:10:56.000000000 -0500
-+++ amarok-2.5.96/src/services/lastfm/ScrobblerAdapter.h 2012-08-02 07:38:24.298556105 -0500
-@@ -20,8 +20,8 @@
-
- #include "core/meta/Meta.h"
-
--#include <lastfm/Audioscrobbler>
--#include <lastfm/Track>
-+#include <lastfm/Audioscrobbler.h>
-+#include <lastfm/Track.h>
-
- #include <QVariant>
-
diff --git a/amarok-2.6.90-ipod_dso.patch b/amarok-2.6.90-ipod_dso.patch
new file mode 100644
index 0000000..5e12103
--- /dev/null
+++ b/amarok-2.6.90-ipod_dso.patch
@@ -0,0 +1,11 @@
+diff -up amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt.dso amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt
+--- amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt.dso 2012-12-13 06:54:53.000000000 -0600
++++ amarok-2.6.90/src/core-impl/collections/ipodcollection/CMakeLists.txt 2012-12-14 11:16:15.201095371 -0600
+@@ -61,6 +61,7 @@ if(IPOD_FOUND AND WITH_IPOD)
+ ${QT_QTGUI_LIBRARY}
+ ${GLIB2_LIBRARIES}
+ ${GDKPIXBUF_LIBRARY}
++ ${GOBJECT_LIBRARIES}
+ ${IPOD_LIBRARIES}
+ )
+
diff --git a/amarok-2.6.90-onlinedoc.patch b/amarok-2.6.90-onlinedoc.patch
new file mode 100644
index 0000000..51f3667
--- /dev/null
+++ b/amarok-2.6.90-onlinedoc.patch
@@ -0,0 +1,91 @@
+diff -up amarok-2.6.90/src/ActionClasses.cpp.onlinedoc amarok-2.6.90/src/ActionClasses.cpp
+--- amarok-2.6.90/src/ActionClasses.cpp.onlinedoc 2012-12-13 06:54:53.000000000 -0600
++++ amarok-2.6.90/src/ActionClasses.cpp 2012-12-14 10:06:34.612852727 -0600
+@@ -33,10 +33,12 @@
+ #include "playlist/PlaylistModelStack.h"
+ #include "widgets/Osd.h"
+
++#include <QFile>
+ #include <KAuthorized>
+ #include <KHelpMenu>
+ #include <KLocale>
+ #include <KToolBar>
++#include <KToolInvocation>
+
+ extern OcsData ocsData;
+
+@@ -62,6 +64,7 @@ namespace Amarok
+ using namespace Amarok;
+
+ KHelpMenu *Menu::s_helpMenu = 0;
++OnlineHelpHandler *Menu::s_onlineHelpHandler = 0;
+
+ static void
+ safePlug( KActionCollection *ac, const char *name, QWidget *w )
+@@ -151,6 +154,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
+
+ KMenu* menu = s_helpMenu->menu();
+
++ // If amarok-doc is not installed, bring up the online version instead.
++ if ( !QFile::exists( "/usr/share/doc/HTML/en/amarok/index.docbook" ) ) {
++ QAction *contentsAction = s_helpMenu->action( KHelpMenu::menuHelpContents );
++ // disconnect the default slot which fires up KHelpCenter
++ disconnect( contentsAction, SIGNAL(triggered(bool)), s_helpMenu, SLOT(appHelpActivated()) );
++ if ( s_onlineHelpHandler == 0 )
++ s_onlineHelpHandler = new OnlineHelpHandler( parent );
++ else
++ // ensure no duplicate connection
++ disconnect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
++ // connect our custom slot which fires up a browser on UserBase instead
++ connect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
++ }
++
+ // NOTE: We hide "Report Bug..." because we need to add it on our own to name the dialog
+ // so it can be blacklisted from LikeBack.
+ s_helpMenu->action( KHelpMenu::menuReportBug )->setVisible( false );
+@@ -163,6 +180,17 @@ Menu::helpMenu( QWidget *parent ) //STAT
+ return menu;
+ }
+
++OnlineHelpHandler::OnlineHelpHandler( QObject* parent )
++ : QObject( parent )
++{
++}
++
++void
++OnlineHelpHandler::onlineHelpActivated()
++{
++ KToolInvocation::invokeBrowser( "http://userbase.kde.org/Amarok/Manual" );
++}
++
+ //////////////////////////////////////////////////////////////////////////////////////////
+ // PlayPauseAction
+ //////////////////////////////////////////////////////////////////////////////////////////
+diff -up amarok-2.6.90/src/ActionClasses.h.onlinedoc amarok-2.6.90/src/ActionClasses.h
+--- amarok-2.6.90/src/ActionClasses.h.onlinedoc 2012-12-13 06:54:53.000000000 -0600
++++ amarok-2.6.90/src/ActionClasses.h 2012-12-14 10:05:43.738430447 -0600
+@@ -34,6 +34,16 @@ class KHelpMenu;
+
+ namespace Amarok
+ {
++ class OnlineHelpHandler : public QObject
++ {
++ Q_OBJECT
++ public:
++ OnlineHelpHandler( QObject* parent );
++
++ public slots:
++ void onlineHelpActivated();
++ };
++
+ class Menu : public KMenu
+ {
+ Q_OBJECT
+@@ -45,6 +55,7 @@ namespace Amarok
+ private:
+ static Menu *s_instance;
+ static KHelpMenu *s_helpMenu;
++ static OnlineHelpHandler *s_onlineHelpHandler;
+ };
+
+ class MenuAction : public KAction
diff --git a/amarok.spec b/amarok.spec
index ee27212..5e7c5ca 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
Name: amarok
Summary: Media player
-Version: 2.6.0
-Release: 7%{?dist}
+Version: 2.6.90
+Release: 1%{?dist}
# KDE e.V. may determine that future GPL versions are accepted
License: GPLv2 or GPLv3
@@ -14,31 +14,23 @@ Url: http://amarok.kde.org/
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/amarok/%{version}/src/amarok-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Invoke a browser on the online UserBase documentation instead of KHelpCenter
# for the help contents if the amarok-doc subpackage is not installed.
-Patch0: amarok-2.5.0-onlinedoc.patch
+Patch0: amarok-2.6.90-onlinedoc.patch
-#Patch50: amarok-2.2.1.90-qtscript_not_required.patch
+## upstreamable patches
+Patch50: amarok-2.6.90-ipod_dso.patch
## upstream patches
-# liblastfm1 support
-# https://git.reviewboard.kde.org/r/105276/
-Patch100: amarok-2.5.96-liblastfm1.patch
-%if 0%{?fedora} > 15
-%define liblastfm1 1
-%endif
-# french translations
-Patch110: amarok-fr_po.patch.bz2
BuildRequires: curl-devel
BuildRequires: desktop-file-utils
## non-modular MusicBrainz-based audio fingerprint tag lookup support :(
#BuildRequires: ffmpeg-devel libofa-devel
BuildRequires: gettext
-BuildRequires: kdelibs4-devel >= 4.6.0
-BuildRequires: liblastfm-devel%{?liblastfm1: >= 1.0}
+BuildRequires: kdelibs4-devel >= 4.9
+BuildRequires: liblastfm-devel >= 1.0
# extra libaio linkage comes from use of mysql_config --libs
BuildRequires: mysql-embedded-devel libaio-devel
BuildRequires: pkgconfig(libgpod-1.0) >= 0.7.0
@@ -58,8 +50,7 @@ BuildRequires: qtscriptbindings
Requires: qtscriptbindings%{?_isa}
Requires: %{name}-utils = %{version}-%{release}
Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
-# aka audiocd-kio (on kde-4.9+)
-Requires: kdemultimedia-kio_audiocd
+Requires: audiocd-kio
Requires: ifuse
Requires: media-player-info
@@ -82,8 +73,6 @@ Requires: %{name} = %{version}-%{release}
%package utils
Summary: Amarok standalone utilities
-Obsoletes: amarok-collectionscanner < 2.0.90-2
-Obsoletes: amarok-utilities < 2.0.96
%description utils
%{summary}, including amarokcollectionscanner.
@@ -101,11 +90,7 @@ BuildArch: noarch
%setup -q
%patch0 -p1 -b .onlinedoc
-#patch50 -p1 -b .qtscript_not_required
-%if 0%{?liblastfm1}
-%patch100 -p1 -b .liblastfm1
-%endif
-%patch110 -p1 -b .fr_po
+%patch50 -p1 -b .ipod_dso
%build
@@ -118,8 +103,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang amarok --with-kde --without-mo && mv amarok.lang amarok-doc.lang
@@ -157,6 +140,7 @@ fi
%{_kde4_bindir}/amarokpkg
%{_kde4_bindir}/amarok_afttagger
%{_kde4_bindir}/amarokmp3tunesharmonydaemon
+%{_kde4_bindir}/amzdownloader
%{_kde4_appsdir}/amarok/
%{_kde4_appsdir}/kconf_update/amarok*
%{_kde4_appsdir}/desktoptheme/default/widgets/*
@@ -185,6 +169,8 @@ fi
%{_kde4_libdir}/libamarokpud.so.1*
%{_kde4_libdir}/libamarok-sqlcollection.so.1*
%{_kde4_libdir}/libamarok-transcoding.so.1*
+# private libs
+%{_kde4_libdir}/libamarok_service_lastfm_shared.so
%{_kde4_libdir}/libampache_account_login.so
%files utils -f amarokcollectionscanner_qt.lang
@@ -194,6 +180,9 @@ fi
%changelog
+* Fri Dec 14 2012 Rex Dieter <rdieter@fedoraproject.org> 2.6.90-1
+- 2.6.90
+
* Thu Nov 27 2012 Jan Grulich <jgrulich@redhat.com> 2.6.0-7
- rebuild (qjson)
diff --git a/sources b/sources
index c9aa4be..c0d9338 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-116f53c1109c7acd1ac7d78ec75c01c4 amarok-2.6.0.tar.bz2
-d3283ff2f2ed381f3cda9a335726881e amarok-fr_po.patch.bz2
+880612996794fed3ae5a72fba4aac61f amarok-2.6.90.tar.bz2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-06 18:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-06 18:05 [rpms/amarok] epel10: 2.6.90 Rex Dieter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox