rpms/amarok/F-10 amarok.spec, 1.141, 1.142 amarok-2.0.96-old-libgpod.patch, 1.5, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	amarok.spec 
Removed Files:
	amarok-2.0.96-old-libgpod.patch 
Log Message:
* Thu May 28 2009 Todd Zullinger <tmz at pobox.com> - 2.0.96-2.20090518.2
- Rebuild against libgpod-0.7.0



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- amarok.spec	26 May 2009 21:47:50 -0000	1.141
+++ amarok.spec	28 May 2009 16:13:31 -0000	1.142
@@ -1,13 +1,10 @@
-%if 0%{?fedora} <= 10
-%define have_libgpod06 1
-%endif
 
 %define snap 20090518
 
 Name:    amarok
 Summary: Media player
 Version: 2.0.96
-Release: 2.%{snap}%{?dist}.1
+Release: 2.%{snap}%{?dist}.2
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -15,9 +12,6 @@ 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)
 
-# 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 \
@@ -34,10 +28,6 @@ BuildRequires: libifp-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
-%endif
-%if 0%{?have_libgpod06}
-BuildRequires: libgpod-devel >= 0.6.0
-%else
 BuildRequires: libgpod-devel >= 0.7.0
 %endif
 BuildRequires: libnjb-devel
@@ -81,9 +71,6 @@ Obsoletes: amarok-utilities < 2.0.96
 
 %patch100 -p0 -b .svn
 %patch50 -p1 -b .qtscript_not_required
-%if 0%{?have_libgpod06}
-%patch0 -p1 -b .libgpod06
-%endif
 
 
 %build
@@ -165,6 +152,9 @@ fi
 
 
 %changelog
+* Thu May 28 2009 Todd Zullinger <tmz at pobox.com> - 2.0.96-2.20090518.2
+- Rebuild against libgpod-0.7.0
+
 * Tue May 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.96-2.20090518.1
 - hack to build against the old libgpod 0.6 in F10
 


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