[rpms/amarok] epel10.2: Rebuild against libgpod-0.7.0

[rpms/amarok] epel10.2: Rebuild against libgpod-0.7.0

[Todd Zullinger]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 562e1365cdcf85d87346e0541d0162c136e22f56
            Author : Todd Zullinger <tmz@fedoraproject.org>
            Date   : 2009-02-20T16:16:44+00:00
            Stats  : +49/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/562e1365cdcf85d87346e0541d0162c136e22f56?branch=epel10.2

            Log:
            Rebuild against libgpod-0.7.0
- Drop gtk2-devel BR, libgpod properly requires that now

---
diff --git a/amarok-libgpod-0.7.0.patch b/amarok-libgpod-0.7.0.patch
new file mode 100644
index 0000000..a1a6077
--- /dev/null
+++ b/amarok-libgpod-0.7.0.patch
@@ -0,0 +1,38 @@
+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

diff --git a/amarok.spec b/amarok.spec
index fd8c975..df20cdb 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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: gettext
 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 @@ Amarok is a multimedia player with:
  - 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 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Fri Feb 20 2009 Todd Zullinger <tmz@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@fedoraproject.org> - 2.0.1.1-2 
 - respin (mysql)