rpms/amarok/devel amarok-libgpod-0.7.0.patch, NONE, 1.1 amarok.spec, 1.131, 1.132

[Todd M. Zullinger]

Author: tmz

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-libgpod-0.7.0.patch 
Log Message:
Rebuild against libgpod-0.7.0

- Drop gtk2-devel BR, libgpod properly requires that now


amarok-libgpod-0.7.0.patch:

--- NEW FILE amarok-libgpod-0.7.0.patch ---
Index: src/collection/ipodcollection/handler/IpodHandler.cpp
===================================================================
--- src/collection/ipodcollection/handler/IpodHandler.cpp	(revision 871432)
+++ src/collection/ipodcollection/handler/IpodHandler.cpp	(revision 871434)
@@ -1025,12 +1025,17 @@
     QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
     QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
 
+#ifdef ITDB_THUMB_COVER_SMALL
     Itdb_Thumb *thumb = NULL;
+#endif
     GdkPixbuf *gpixbuf = NULL;
     QString thumbPath;
 
     // pull image out of ipod
 
+#ifdef ITDB_THUMB_COVER_SMALL
+    // we've got libgpod 0.6.0 here
+
     if( ipodtrack->has_artwork == 0x01 )
     {
         // try small first
@@ -1115,7 +1120,15 @@
             }
         }
     }
+#else
+    // libgpod 0.7.0
 
+    if( itdb_track_has_thumbnails ( ipodtrack ) )
+    {
+        gpixbuf = (GdkPixbuf*) itdb_track_get_thumbnail (ipodtrack, -1, -1 );
+    }
+#endif
+
     if(gpixbuf != NULL)
     {
         // temporarily save to file


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- amarok.spec	22 Jan 2009 21:11:35 -0000	1.131
+++ amarok.spec	20 Feb 2009 16:16:44 -0000	1.132
@@ -2,12 +2,15 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+# From amarok svn, r871433 (Note that this was reverted later, I believe the
+# reasoning for reverting was incorrect. -- tmz :)
+Patch0:  amarok-libgpod-0.7.0.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: curl-devel
@@ -17,7 +20,7 @@
 BuildRequires: giflib-devel pcre-devel
 BuildRequires: kdelibs4-devel >= 4.1.0
 BuildRequires: libifp-devel
-BuildRequires: libgpod-devel gtk2-devel
+BuildRequires: libgpod-devel
 BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
@@ -46,7 +49,8 @@
  - nice GUI, integrates into the KDE look, but with a unique touch
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p0 -b .libgpod-0.7.0
 
 
 %build
@@ -113,6 +117,10 @@
 
 
 %changelog
+* Fri Feb 20 2009 Todd Zullinger <tmz at pobox.com> - 2.0.1.1-3
+- Rebuild against libgpod-0.7.0
+- Drop gtk2-devel BR, libgpod properly requires that now
+
 * Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-2 
 - respin (mysql)