diff --git a/.cvsignore b/.cvsignore index fada88c..ba488fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amarok-2.2.2.tar.bz2 +amarok-2.3.0.tar.bz2 diff --git a/amarok.spec b/amarok.spec index 9592034..51e13e7 100644 --- a/amarok.spec +++ b/amarok.spec @@ -1,8 +1,8 @@ Name: amarok Summary: Media player -Version: 2.2.2 -Release: 3%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -10,13 +10,13 @@ Url: http://amarok.kde.org/ Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: amarok-2.2.2-no_var_tracking.patch +# Patch1: amarok-2.2.2-no_var_tracking.patch Patch50: amarok-2.2.1.90-qtscript_not_required.patch ## upstream patches # http://bugs.kde.org/220532 -Patch100: amarok-2.2.2-kde#220532.patch +# Patch100: amarok-2.2.2-kde#220532.patch BuildRequires: curl-devel BuildRequires: desktop-file-utils @@ -85,11 +85,11 @@ Obsoletes: amarok-utilities < 2.0.96 %prep %setup -q -%if 0%{?fedora} > 11 || 0%{?rhel} > 5 -%patch1 -p1 -b .no_var_tracking -%endif +# %if 0%{?fedora} > 11 || 0%{?rhel} > 5 +# %patch1 -p1 -b .no_var_tracking +# %endif %patch50 -p1 -b .qtscript_not_required -%patch100 -p1 -b .kde#220532 +# %patch100 -p1 -b .kde#220532 %build @@ -114,7 +114,7 @@ cat amarokpkg.lang >> amarok.lang cat amarok_scriptengine_qscript.lang >> amarok.lang # unpackaged files -rm -f %{buildroot}%{_kde4_libdir}/libamarok{_taglib,lib,plasma,pud,ocsclient}.so +rm -f %{buildroot}%{_kde4_libdir}/libamarok{-sqlcollection,_taglib,lib,plasma,pud,ocsclient}.so %check @@ -174,6 +174,7 @@ fi %{_kde4_libdir}/libamaroklib.so.1* %{_kde4_libdir}/libamarokocsclient.so.4* %{_kde4_libdir}/libamarokpud.so.1* +%{_kde4_libdir}/libamarok-sqlcollection.so.1* %files utils -f amarokcollectionscanner_qt.lang %defattr(-,root,root,-) @@ -181,6 +182,9 @@ fi %changelog +* Thu Mar 11 2010 Thomas Janssen 2.3.0-1 +- amarok 2.3.0 + * Sun Jan 10 2010 Rex Dieter - 2.2.2-3 - collection scan crash patch, take 2 (kde#220532) diff --git a/sources b/sources index 27ab552..153811c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2c4ae2f2ff7154a064b554cdee557a9 amarok-2.2.2.tar.bz2 +fc672a2848e36b3b44eb81dd1466e4f4 amarok-2.3.0.tar.bz2