diff --git a/.cvsignore b/.cvsignore index 1cb4040..b0a8ae2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ amarok-2.0.96.tar.bz2 +amarok-20090518svn.patch.gz diff --git a/amarok.spec b/amarok.spec index 0407985..eb02440 100644 --- a/amarok.spec +++ b/amarok.spec @@ -1,8 +1,10 @@ +%define snap 20090518 + Name: amarok Summary: Media player Version: 2.0.96 -Release: 1%{?dist} +Release: 2.%{snap}%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -12,6 +14,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch50: amarok-2.0.90-qtscript_not_required.patch +# svn diff \ +# svn://anonsvn.kde.org/home/kde/tags/amarok/2.0.96/amarok/ \ +# svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/ +# and manually tweaked a bit to apply +Patch100: amarok-%{snap}svn.patch.gz + BuildRequires: curl-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -63,6 +71,7 @@ Obsoletes: amarok-utilities < 2.0.96 %prep %setup -q +%patch100 -p0 -b .svn %patch50 -p1 -b .qtscript_not_required @@ -145,6 +154,9 @@ fi %changelog +* Mon May 18 2009 Rex Dieter 2.0.96-2.20090518 +- 20090518svn snapshot + * Mon May 11 2009 Rex Dieter 2.0.96-1 - amarok-2.9.96 (2.1 beta2) - -utilities -> -utils diff --git a/sources b/sources index 86ae4c4..5a651cb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 04239b2fec6e8dd8b2ea89db0779e196 amarok-2.0.96.tar.bz2 +55a55c44af648f6bf3f8db5b561c1c1b amarok-20090518svn.patch.gz