rpms/amarok/F-10 .cvsignore, 1.44, 1.45 amarok.spec, 1.145, 1.146 sources, 1.46, 1.47 amarok-2.0.96-old-libgpod.patch, 1.7, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24196

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	amarok-2.0.96-old-libgpod.patch 
Log Message:
* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-1
- amarok-2.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	30 May 2009 16:58:36 -0000	1.44
+++ .cvsignore	14 Jun 2009 00:08:07 -0000	1.45
@@ -1 +1 @@
-amarok-2.1.tar.bz2
+amarok-2.1.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- amarok.spec	2 Jun 2009 21:14:17 -0000	1.145
+++ amarok.spec	14 Jun 2009 00:08:07 -0000	1.146
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.1
-Release: 0.9%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -10,9 +10,6 @@ Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# This basically reverts http://websvn.kde.org/?view=rev&revision=916188
-# (replaces itdb_artwork_get_pixbuf (new in 0.7) by the old code from 2.0.2).
-Patch0:  amarok-2.0.96-old-libgpod.patch
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 # svn diff \
@@ -29,7 +26,7 @@ BuildRequires: libifp-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
-BuildRequires: libgpod-devel = 0.6.0
+BuildRequires: libgpod-devel >= 0.7.0
 %endif
 BuildRequires: libnjb-devel
 BuildRequires: libusb-devel
@@ -43,6 +40,7 @@ BuildRequires: taglib-extras-devel
 %global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.2.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 %{?kdelibs4_version:Requires: kdelibs4 >= %{kdelibs4_version}}
+BuildRequires: qtscriptbindings
 Requires: qtscriptbindings
 Requires: %{name}-utils = %{version}-%{release}
 
@@ -70,7 +68,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q
 
-%patch0 -p1 -b .libgpod06
 %patch50 -p1 -b .qtscript_not_required
 
 
@@ -153,9 +150,11 @@ fi
 
 
 %changelog
-* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1-0.9
+* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1.1-1
+- amarok-2.1.1
+
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 2.1-1
 - amarok-2.1
-- temp build against libgpod-0.6.0
 
 * 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/F-10/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	30 May 2009 16:58:36 -0000	1.46
+++ sources	14 Jun 2009 00:08:07 -0000	1.47
@@ -1 +1 @@
-76e5496a1bf2a8116210143f6479c1fb  amarok-2.1.tar.bz2
+c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2


--- amarok-2.0.96-old-libgpod.patch DELETED ---