[amarok] 2.4.1 beta1

[Rex Dieter]

commit d80b7b8c8d0191a7fd2808a0078e569f235bdd77
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 21 14:42:54 2011 -0500

    2.4.1 beta1

 .gitignore                           |    1 +
 amarok-2.4.0.90-plugin_version.patch |   21 +++++++++++++++++++++
 amarok.spec                          |   17 +++++++++++------
 sources                              |    2 +-
 4 files changed, 34 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c93256f..f46897d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /amarok-2.3.2.tar.bz2
 /amarok-2.4.0.tar.bz2
+/amarok-2.4.0.90.tar.bz2
diff --git a/amarok-2.4.0.90-plugin_version.patch b/amarok-2.4.0.90-plugin_version.patch
new file mode 100644
index 0000000..8a96625
--- /dev/null
+++ b/amarok-2.4.0.90-plugin_version.patch
@@ -0,0 +1,21 @@
+commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
+Author: Rick W. Chen <stuffcorpse at archlinux.us>
+Date:   Thu Mar 17 18:38:19 2011 +1300
+
+    Fix plugin loading and bump_plugin_version.rb script
+
+diff --git a/release_scripts/bump_plugin_version.rb b/release_scripts/bump_plugin_version.rb
+index 9f0c71a..d2194a2 100755
+diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
+index ff52646..1e34510 100644
+--- a/src/PluginManager.cpp
++++ b/src/PluginManager.cpp
+@@ -32,7 +32,7 @@
+ #include <QFile>
+ #include <QMetaEnum>
+ 
+-const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
++const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
+ Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
+ 
+ Plugins::PluginManager*
diff --git a/amarok.spec b/amarok.spec
index 9463474..665aa09 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -5,19 +5,20 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.4.0
-Release: 3%{?dist}
+Version: 2.4.0.90
+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/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/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.0.90-plugin_version.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -90,7 +91,8 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q 
 
-#%patch50 -p1 -b .qtscript_not_required
+#patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .plugin_version
 
 %build
 mkdir -p %{_target_platform}
@@ -114,7 +116,7 @@ cat amarokpkg.lang >> amarok.lang
 cat amarok_scriptengine_qscript.lang >> amarok.lang
 
 # unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plasma,pud,ocsclient,-transcoding,qtjson}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,core,lib,plasma,pud,ocsclient,-transcoding}.so
 
 
 %check
@@ -153,6 +155,7 @@ fi
 %{_kde4_bindir}/amarok_afttagger
 %{_kde4_bindir}/amarokmp3tunesharmonydaemon
 %{_kde4_appsdir}/amarok/
+%{_kde4_appsdir}/kconf_update/amarok*
 %{_kde4_appsdir}/desktoptheme/Amarok-Mockup/
 %{_kde4_appsdir}/desktoptheme/default/widgets/*
 %{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
@@ -178,7 +181,6 @@ fi
 %{_kde4_libdir}/libamarokpud.so.1*
 %{_kde4_libdir}/libamarok-sqlcollection.so.1*
 %{_kde4_libdir}/libamarok-transcoding.so.1*
-%{_kde4_libdir}/libamarokqtjson.so.1*
 %{_kde4_libdir}/libampache_account_login.so
 
 %files utils -f amarokcollectionscanner_qt.lang
@@ -187,6 +189,9 @@ fi
 
 
 %changelog
+* Mon Mar 21 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.0.90-1
+- 2.4.1 beta1
+
 * Wed Feb 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.0-3
 - License: GPLv2 or GPLv3 
 
diff --git a/sources b/sources
index 0375ab2..1d3d794 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdb6ddc8e38d0982a0786ff8ac96d923  amarok-2.4.0.tar.bz2
+b32cf034fb4bdcfcff75fae70d43caa9  amarok-2.4.0.90.tar.bz2