[amarok] 2.7.0

[Rex Dieter]

commit 03cd0c5e6c8d66eeaa1b095bf7dde594e553aa45
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jan 17 16:26:30 2013 -0600

    2.7.0

 .gitignore                                         |    4 +--
 amarok-2.6.90-ipod_dso.patch                       |   11 ----------
 ...onlinedoc.patch => amarok-2.7.0-onlinedoc.patch |   22 ++++++++++----------
 amarok.spec                                        |   11 +++++----
 sources                                            |    2 +-
 5 files changed, 19 insertions(+), 31 deletions(-)
---
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-onlinedoc.patch b/amarok-2.7.0-onlinedoc.patch
similarity index 78%
rename from amarok-2.6.90-onlinedoc.patch
rename to amarok-2.7.0-onlinedoc.patch
index 51f3667..9ad6c7a 100644
--- a/amarok-2.6.90-onlinedoc.patch
+++ b/amarok-2.7.0-onlinedoc.patch
@@ -1,9 +1,9 @@
-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"
+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>
@@ -14,7 +14,7 @@ diff -up amarok-2.6.90/src/ActionClasses.cpp.onlinedoc amarok-2.6.90/src/ActionC
  
  extern OcsData ocsData;
  
-@@ -62,6 +64,7 @@ namespace Amarok
+@@ -63,6 +65,7 @@ namespace Amarok
  using namespace Amarok;
  
  KHelpMenu *Menu::s_helpMenu = 0;
@@ -22,7 +22,7 @@ diff -up amarok-2.6.90/src/ActionClasses.cpp.onlinedoc amarok-2.6.90/src/ActionC
  
  static void
  safePlug( KActionCollection *ac, const char *name, QWidget *w )
-@@ -151,6 +154,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
+@@ -152,6 +155,20 @@ Menu::helpMenu( QWidget *parent ) //STAT
  
      KMenu* menu = s_helpMenu->menu();
  
@@ -43,7 +43,7 @@ diff -up amarok-2.6.90/src/ActionClasses.cpp.onlinedoc amarok-2.6.90/src/ActionC
      // 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
+@@ -164,6 +181,17 @@ Menu::helpMenu( QWidget *parent ) //STAT
      return menu;
  }
  
@@ -61,9 +61,9 @@ diff -up amarok-2.6.90/src/ActionClasses.cpp.onlinedoc amarok-2.6.90/src/ActionC
  //////////////////////////////////////////////////////////////////////////////////////////
  // 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
+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
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 at fedoraproject.org> 2.7.0-1
+- 2.7.0
+
 * Sat Dec 15 2012 Rex Dieter <rdieter at 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