rpms/amarok/F-10 amarok-2.0.96-old-libgpod.patch, NONE, 1.1 amarok.spec, 1.139, 1.140

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.96-old-libgpod.patch 
Log Message:
* 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

This one most likely won't build, I want to see how far we get and how much I have to fix.

amarok-2.0.96-old-libgpod.patch:

--- NEW FILE amarok-2.0.96-old-libgpod.patch ---
diff -ur amarok-2.0.96/CMakeLists.txt amarok-2.0.96-old-libgpod/CMakeLists.txt
--- amarok-2.0.96/CMakeLists.txt	2009-05-26 23:22:01.000000000 +0200
+++ amarok-2.0.96-old-libgpod/CMakeLists.txt	2009-05-26 23:22:54.000000000 +0200
@@ -54,10 +54,7 @@
     macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "" )
 
     macro_optional_find_package(Ipod)
-    if(IPOD_FOUND)
-        macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7)
-    endif(IPOD_FOUND)
-    macro_log_feature( IPOD_0_7 "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" )
+    macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" )
  
     if( WITH_Ipod )
         macro_optional_find_package(Gdk)
diff -ur amarok-2.0.96/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.96-old-libgpod/src/collection/ipodcollection/CMakeLists.txt
--- amarok-2.0.96/src/collection/ipodcollection/CMakeLists.txt	2009-05-26 23:22:01.000000000 +0200
+++ amarok-2.0.96-old-libgpod/src/collection/ipodcollection/CMakeLists.txt	2009-05-26 23:23:35.000000000 +0200
@@ -7,7 +7,7 @@
    SET(GDK_LIBRARIES "")
 endif(NOT GDK_FOUND)
 
-if (IPOD_FOUND AND IPOD_0_7 AND WITH_Ipod)
+if (IPOD_FOUND AND WITH_Ipod)
    include_directories( ../..
    ../../plugin
    ../../meta
@@ -66,4 +66,4 @@
         amarok_collection-ipodcollection.desktop 
         DESTINATION 
         ${SERVICES_INSTALL_DIR})
-endif (IPOD_FOUND AND IPOD_0_7 AND WITH_Ipod)
+endif (IPOD_FOUND AND WITH_Ipod)


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- amarok.spec	18 May 2009 17:17:55 -0000	1.139
+++ amarok.spec	26 May 2009 21:27:00 -0000	1.140
@@ -1,10 +1,13 @@
+%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}
+Release: 2.%{snap}%{?dist}.1
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,6 +15,7 @@ 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)
 
+Patch0:  amarok-2.0.96-old-libgpod.patch
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 # svn diff \
@@ -29,7 +33,9 @@ BuildRequires: libmp4v2-devel
 %if 0%{?fedora} > 9
 BuildRequires: libmtp-devel >= 0.3.0
 %endif
-%if 0%{?fedora} > 10
+%if 0%{?have_libgpod06}
+BuildRequires: libgpod-devel >= 0.6.0
+%else
 BuildRequires: libgpod-devel >= 0.7.0
 %endif
 BuildRequires: libnjb-devel
@@ -73,6 +79,9 @@ 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
@@ -154,6 +163,9 @@ fi
 
 
 %changelog
+* 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
+
 * Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-2.20090518
 - 20090518svn snapshot