2.4.1 (final)

This commit is contained in:
Rex Dieter 2011-05-06 12:52:30 -05:00
commit f4adb68de5
4 changed files with 8 additions and 26 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/amarok-2.3.2.tar.bz2
/amarok-2.4.0.tar.bz2
/amarok-2.4.0.90.tar.bz2
/amarok-2.4.1.tar.bz2

View file

@ -1,21 +0,0 @@
commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
Author: Rick W. Chen <stuffcorpse@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*

View file

@ -5,8 +5,8 @@
Name: amarok
Summary: Media player
Version: 2.4.0.90
Release: 2%{?dist}
Version: 2.4.1
Release: 1%{?dist}
Group: Applications/Multimedia
# KDE e.V. may determine that future GPL versions are accepted
@ -18,7 +18,6 @@ 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
@ -92,7 +91,7 @@ Obsoletes: amarok-utilities < 2.0.96
%setup -q
#patch50 -p1 -b .qtscript_not_required
%patch100 -p1 -b .plugin_version
%build
mkdir -p %{_target_platform}
@ -189,6 +188,9 @@ fi
%changelog
* Fri May 06 2011 Rex Dieter <rdieter@fedoraproject.org> 2.4.1-1
- 2.4.1 (final)
* Wed Mar 23 2011 Rex Dieter <rdieter@fedoraproject.org> 2.4.0.90-2
- rebuild (mysql)

View file

@ -1 +1 @@
b32cf034fb4bdcfcff75fae70d43caa9 amarok-2.4.0.90.tar.bz2
4c65c5cd4d7bd267bdbef8e912fd6cb6 amarok-2.4.1.tar.bz2