rpms/amarok/devel .cvsignore, 1.46, 1.47 amarok.spec, 1.152, 1.153 sources, 1.47, 1.48

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10675

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1-1
- amarok-2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	18 May 2009 16:06:46 -0000	1.46
+++ .cvsignore	30 May 2009 16:53:12 -0000	1.47
@@ -1,2 +1 @@
-amarok-2.0.96.tar.bz2
-amarok-20090518svn.patch.gz
+amarok-2.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- amarok.spec	18 May 2009 17:17:56 -0000	1.152
+++ amarok.spec	30 May 2009 16:53:12 -0000	1.153
@@ -1,15 +1,13 @@
 
-%define snap 20090518
-
 Name:    amarok
 Summary: Media player
-Version: 2.0.96
-Release: 2.%{snap}%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 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.0.90-qtscript_not_required.patch
@@ -18,7 +16,7 @@ Patch50: amarok-2.0.90-qtscript_not_requ
 #  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
+#Patch100: amarok-%{snap}svn.patch.gz
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -28,8 +26,6 @@ BuildRequires: libifp-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
-%endif
-%if 0%{?fedora} > 10
 BuildRequires: libgpod-devel >= 0.7.0
 %endif
 BuildRequires: libnjb-devel
@@ -71,7 +67,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q
 
-%patch100 -p0 -b .svn
 %patch50 -p1 -b .qtscript_not_required
 
 
@@ -154,6 +149,9 @@ fi
 
 
 %changelog
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1-1
+- amarok-2.1
+
 * Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-2.20090518
 - 20090518svn snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	18 May 2009 16:06:46 -0000	1.47
+++ sources	30 May 2009 16:53:13 -0000	1.48
@@ -1,2 +1 @@
-04239b2fec6e8dd8b2ea89db0779e196  amarok-2.0.96.tar.bz2
-55a55c44af648f6bf3f8db5b561c1c1b  amarok-20090518svn.patch.gz
+76e5496a1bf2a8116210143f6479c1fb  amarok-2.1.tar.bz2