[rpms/amarok] epel10.2: 2.7.0

[rpms/amarok] epel10.2: 2.7.0

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 03cd0c5e6c8d66eeaa1b095bf7dde594e553aa45
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2013-01-17T16:26:30-06:00
Stats  : +99/-111 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/03cd0c5e6c8d66eeaa1b095bf7dde594e553aa45?branch=epel10.2

Log:
2.7.0

---
diff --git a/.gitignore b/.gitignore
index 000519c..5c31325 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/amarok-2.6.0.tar.bz2
-/amarok-fr_po.patch.bz2
-/amarok-2.6.90.tar.bz2
+/amarok-2.7.0.tar.bz2

diff --git a/amarok-2.6.90-ipod_dso.patch b/amarok-2.6.90-ipod_dso.patch
deleted file mode 100644
index 5e12103..0000000
--- a/amarok-2.6.90-ipod_dso.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 51f3667..0000000
--- a/amarok-2.6.90-onlinedoc.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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-2.7.0-onlinedoc.patch b/amarok-2.7.0-onlinedoc.patch
new file mode 100644
index 0000000..9ad6c7a
--- /dev/null
+++ b/amarok-2.7.0-onlinedoc.patch
@@ -0,0 +1,91 @@
+diff -up amarok-2.7.0/src/ActionClasses.cpp.onlinedoc amarok-2.7.0/src/ActionClasses.cpp
+--- amarok-2.7.0/src/ActionClasses.cpp.onlinedoc	2013-01-17 06:53:54.000000000 -0600
++++ amarok-2.7.0/src/ActionClasses.cpp	2013-01-17 16:23:03.357440692 -0600
+@@ -34,10 +34,12 @@
+ #include "widgets/Osd.h"
+ #include "KNotificationBackend.h"
+ 
++#include <QFile>
+ #include <KAuthorized>
+ #include <KHelpMenu>
+ #include <KLocale>
+ #include <KToolBar>
++#include <KToolInvocation>
+ 
+ extern OcsData ocsData;
+ 
+@@ -63,6 +65,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 )
+@@ -152,6 +155,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 );
+@@ -164,6 +181,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.7.0/src/ActionClasses.h.onlinedoc amarok-2.7.0/src/ActionClasses.h
+--- amarok-2.7.0/src/ActionClasses.h.onlinedoc	2013-01-17 06:53:54.000000000 -0600
++++ amarok-2.7.0/src/ActionClasses.h	2013-01-17 16:22:05.828136774 -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 79975d1..93aac3a 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.6.90
-Release: 2%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -17,10 +17,9 @@ Source0: http://download.kde.org/%{stable}/amarok/%{version}/src/amarok-%{versio
 
 # 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.6.90-onlinedoc.patch
+Patch0:  amarok-2.7.0-onlinedoc.patch
 
 ## upstreamable patches
-Patch50:  amarok-2.6.90-ipod_dso.patch
 
 ## upstream patches
 
@@ -91,7 +90,6 @@ BuildArch: noarch
 %setup -q 
 
 %patch0 -p1 -b .onlinedoc
-%patch50 -p1 -b .ipod_dso
 
 
 %build
@@ -181,6 +179,9 @@ fi
 
 
 %changelog
+* Thu Jan 17 2013 Rex Dieter <rdieter@fedoraproject.org> 2.7.0-1
+- 2.7.0
+
 * Sat Dec 15 2012 Rex Dieter <rdieter@fedoraproject.org> - 2.6.90-2
 - up build deps (nepomuk-core, liblastfm)
 - changelog: prune, fix bad dates

diff --git a/sources b/sources
index c0d9338..60bd9b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-880612996794fed3ae5a72fba4aac61f  amarok-2.6.90.tar.bz2
+4ccb750a9e86ce17d4172f770ac7a663  amarok-2.7.0.tar.bz2