[rpms/amarok] epel10.2: 2.5.0

[Rex Dieter <rdieter@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : a6174c1d6d3aee154fcd4c6d950edf66bc5e09c4
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2011-12-18T15:57:29-06:00
Stats  : +7/-76 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/a6174c1d6d3aee154fcd4c6d950edf66bc5e09c4?branch=epel10.2

Log:
2.5.0

---
diff --git a/.gitignore b/.gitignore
index f753b5d..fdba003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /amarok-2.4.3.tar.bz2
-/amarok-2.4.90.tar.bz2
+/amarok-2.5.0.tar.bz2

diff --git a/amarok-2.4.90-mygpo-qt-prefix.patch b/amarok-2.4.90-mygpo-qt-prefix.patch
deleted file mode 100644
index 94b8981..0000000
--- a/amarok-2.4.90-mygpo-qt-prefix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/services/gpodder/GpodderPodcastMeta.h b/src/services/gpodder/GpodderPodcastMeta.h
-index 0688eb0..7fbad35 100644
---- a/src/services/gpodder/GpodderPodcastMeta.h
-+++ b/src/services/gpodder/GpodderPodcastMeta.h
-@@ -23,7 +23,7 @@
- #include "core/podcasts/PodcastMeta.h"
- #include "core/playlists/PlaylistProvider.h"
- 
--#include "ApiRequest.h"
-+#include <mygpo-qt/ApiRequest.h>
- 
- namespace Podcasts {
- 
-diff --git a/src/services/gpodder/GpodderProvider.h b/src/services/gpodder/GpodderProvider.h
-index 8793741..943d261 100644
---- a/src/services/gpodder/GpodderProvider.h
-+++ b/src/services/gpodder/GpodderProvider.h
-@@ -24,6 +24,7 @@
- 
- #include <mygpo-qt/ApiRequest.h>
- #include <mygpo-qt/EpisodeActionList.h>
-+
- #include "core/podcasts/PodcastReader.h"
- #include "playlistmanager/PlaylistManager.h"
- #include "playlistmanager/file/KConfigSyncRelStore.h"
-diff --git a/src/services/gpodder/GpodderServiceModel.h b/src/services/gpodder/GpodderServiceModel.h
-index 23a1cd3..d70cc1e 100644
---- a/src/services/gpodder/GpodderServiceModel.h
-+++ b/src/services/gpodder/GpodderServiceModel.h
-@@ -21,9 +21,12 @@
- 
- #include <QAbstractItemModel>
- #include <QStringList>
--#include <ApiRequest.h>
-+
-+#include <mygpo-qt/ApiRequest.h>
-+#include <mygpo-qt/TagList.h>
-+
- #include "NetworkAccessManagerProxy.h"
--#include <TagList.h>
-+
- #include "GpodderTreeItem.h"
- 
- class GpodderTreeItem;
-diff --git a/src/services/gpodder/GpodderServiceSettings.cpp b/src/services/gpodder/GpodderServiceSettings.cpp
-index 6369602..8b08324 100644
---- a/src/services/gpodder/GpodderServiceSettings.cpp
-+++ b/src/services/gpodder/GpodderServiceSettings.cpp
-@@ -20,6 +20,7 @@
- #define DEBUG_PREFIX "GpodderServiceSettings"
- 
- #include <mygpo-qt/ApiRequest.h>
-+
- #include "GpodderServiceSettings.h"
- #include "core/support/Amarok.h"
- #include "core/support/Debug.h"
-diff --git a/src/services/gpodder/GpodderServiceSettings.h b/src/services/gpodder/GpodderServiceSettings.h
-index 533aaa3..4781452 100644
---- a/src/services/gpodder/GpodderServiceSettings.h
-+++ b/src/services/gpodder/GpodderServiceSettings.h
-@@ -20,7 +20,8 @@
- #ifndef GPODDERSERVICESETTINGS_H
- #define GPODDERSERVICESETTINGS_H
- 
--#include <ApiRequest.h>
-+#include <mygpo-qt/ApiRequest.h>
-+
- #include "GpodderServiceConfig.h"
- #include "core/podcasts/PodcastMeta.h"
- 

diff --git a/amarok.spec b/amarok.spec
index 1c9bd85..af67be2 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,20 +1,19 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.4.90
+Version: 2.5.0
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: amarok-2.4.90-mygpo-qt-prefix.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -77,7 +76,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 #patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .mygpo-qt-prefix
 
 
 %build
@@ -175,6 +173,9 @@ fi
 
 
 %changelog
+* Fri Dec 16 2011 Rex Dieter <rdieter@fedoraproject.org> 2.5.0-1
+- 2.5.0
+
 * Mon Nov 14 2011 Rex Dieter <rdieter@fedoraproject.org> 2.4.90-1
 - 2.4.90
 

diff --git a/sources b/sources
index 9a3a501..ed9678e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92c77437c70f0086e91b4dc4842268c7  amarok-2.4.90.tar.bz2
+b7983eaa33e4771769ae9e330c811995  amarok-2.5.0.tar.bz2