[amarok] 2.8.0

[Rex Dieter]

commit 77d98e34e3fca8a02959514fdb1b8043f7a4197b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Aug 15 10:42:18 2013 -0500

    2.8.0

 .gitignore                                         |    2 +-
 ...Cache-work-around-Solid-UDisks2-bug-by-no.patch |   64 --------------------
 ...onlinedoc.patch => amarok-2.8.0-onlinedoc.patch |   26 ++++----
 amarok.spec                                        |   16 ++---
 sources                                            |    2 +-
 5 files changed, 22 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79c3d26..381d49d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /amarok-2.7.1.tar.bz2
-/amarok-2.7.90.tar.bz2
+/amarok-2.8.0.tar.bz2
diff --git a/amarok-2.7.0-onlinedoc.patch b/amarok-2.8.0-onlinedoc.patch
similarity index 74%
rename from amarok-2.7.0-onlinedoc.patch
rename to amarok-2.8.0-onlinedoc.patch
index 9ad6c7a..a4d1df8 100644
--- a/amarok-2.7.0-onlinedoc.patch
+++ b/amarok-2.8.0-onlinedoc.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -up amarok-2.8.0/src/ActionClasses.cpp.onlinedoc amarok-2.8.0/src/ActionClasses.cpp
+--- amarok-2.8.0/src/ActionClasses.cpp.onlinedoc	2013-08-14 15:22:51.000000000 -0500
++++ amarok-2.8.0/src/ActionClasses.cpp	2013-08-15 10:40:40.656472890 -0500
+@@ -33,10 +33,12 @@
  #include "widgets/Osd.h"
  #include "KNotificationBackend.h"
  
@@ -14,7 +14,7 @@ diff -up amarok-2.7.0/src/ActionClasses.cpp.onlinedoc amarok-2.7.0/src/ActionCla
  
  extern OcsData ocsData;
  
-@@ -63,6 +65,7 @@ namespace Amarok
+@@ -62,6 +64,7 @@ namespace Amarok
  using namespace Amarok;
  
  KHelpMenu *Menu::s_helpMenu = 0;
@@ -22,7 +22,7 @@ diff -up amarok-2.7.0/src/ActionClasses.cpp.onlinedoc amarok-2.7.0/src/ActionCla
  
  static void
  safePlug( KActionCollection *ac, const char *name, QWidget *w )
-@@ -152,6 +155,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
+@@ -151,6 +154,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
  
      KMenu* menu = s_helpMenu->menu();
  
@@ -40,10 +40,10 @@ diff -up amarok-2.7.0/src/ActionClasses.cpp.onlinedoc amarok-2.7.0/src/ActionCla
 +        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
+     // "What's This" isn't currently defined for anything in Amarok, so let's remove it
+     s_helpMenu->action( KHelpMenu::menuWhatsThis )->setVisible( false );
+ 
+@@ -160,6 +177,17 @@ Menu::helpMenu( QWidget *parent ) //STAT
      return menu;
  }
  
@@ -61,9 +61,9 @@ diff -up amarok-2.7.0/src/ActionClasses.cpp.onlinedoc amarok-2.7.0/src/ActionCla
  //////////////////////////////////////////////////////////////////////////////////////////
  // 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
+diff -up amarok-2.8.0/src/ActionClasses.h.onlinedoc amarok-2.8.0/src/ActionClasses.h
+--- amarok-2.8.0/src/ActionClasses.h.onlinedoc	2013-08-14 15:22:51.000000000 -0500
++++ amarok-2.8.0/src/ActionClasses.h	2013-08-15 10:38:12.378047150 -0500
 @@ -34,6 +34,16 @@ class KHelpMenu;
  
  namespace Amarok
diff --git a/amarok.spec b/amarok.spec
index 142752c..c9618a7 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.7.90
-Release: 2%{?dist}
+Version: 2.8.0
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -17,12 +17,11 @@ 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.7.0-onlinedoc.patch
+Patch0:  amarok-2.8.0-onlinedoc.patch
 
 ## upstreamable patches
 
 ## upstream patches
-Patch0071: 0071-MediaDeviceCache-work-around-Solid-UDisks2-bug-by-no.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -96,11 +95,7 @@ BuildArch: noarch
 %prep
 %setup -q 
 
-# amarok now has an onlinehelp handler, see how well that works before
-# deciding to remove or rebase this. -- rex
-#patch0 -p1 -b .onlinedoc
-
-%patch0071 -p1 -b .0071
+%patch0 -p1 -b .onlinedoc
 
 
 %build
@@ -195,6 +190,9 @@ fi
 
 
 %changelog
+* Thu Aug 15 2013 Rex Dieter <rdieter at fedoraproject.org> 2.8.0-1
+- 2.8.0
+
 * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 2.7.90-2
 - Perl 5.18 rebuild
 
diff --git a/sources b/sources
index 65243ab..e1a5962 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71b7d5949578bbc2365d0861126b38c0  amarok-2.7.90.tar.bz2
+53cfcb4819668b10e13b061478c7b32a  amarok-2.8.0.tar.bz2