From f4f850ece4d5bcd77cba0e5757f124608ddadf75 Mon Sep 17 00:00:00 2001
From: chkr <chkr@fedoraproject.org>
Date: Dec 16 2009 23:47:50 +0000
Subject: - Update to latest snapshot to pick up DeviceKit-disks integration to fix

    iPod support (BZ 495240)
- Add a minor patch to fix the last.fm integration

---

diff --git a/.cvsignore b/.cvsignore
index cb4f068..c3fd41c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-banshee-1-1.5.2.tar.bz2
+banshee-20091216.tar.bz2
diff --git a/banshee-20091216-last.fm.patch b/banshee-20091216-last.fm.patch
new file mode 100644
index 0000000..fdd1d2e
--- /dev/null
+++ b/banshee-20091216-last.fm.patch
@@ -0,0 +1,14 @@
+diff -uNr banshee-20091216.old/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs banshee-20091216/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
+--- banshee-20091216.old/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	2009-12-16 20:20:03.000000000 +0100
++++ banshee-20091216/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	2009-12-16 23:55:14.000000000 +0100
+@@ -106,7 +106,9 @@
+             Properties.Set<LastfmColumnController> ("TrackView.ColumnController", new LastfmColumnController ());
+ 
+             // FIXME this is temporary until we split the GUI part from the non-GUI part
+-            Properties.Set<ISourceContents> ("Nereid.SourceContents", new LazyLoadSourceContents<LastfmSourceContents> ());
++            // LastfmSourceContents must not be initialized lazily in order to get
++            // DataCore.UserAgent/CachePath correctly set by the static constructor
++            Properties.Set<ISourceContents> ("Nereid.SourceContents", new LastfmSourceContents ());
+             Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
+ 
+             actions = new LastfmActions (this);
diff --git a/banshee.spec b/banshee.spec
index 809cf52..08e864d 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -1,13 +1,13 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
-%global mainver 1.5.2
+%global mainver 1.5.3
 
-#global gitdate 20091118
-#global gitcommit af591d1e5442ddad935d701a6bddeb86a7627024
+%global gitdate 20091216
+%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-#Release: 0.1.%{gitdate}git%{?dist}
-Release: 1%{?dist}
+Release: 0.1.%{gitdate}git%{?dist}
+#Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -16,13 +16,17 @@ URL:     http://banshee-project.org/
 
 # based on libdrm's make-git-snapshot.sh 
 # sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
-#Source0: %{name}-%{gitdate}.tar.bz2
-Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
+#Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 Source2: %{name}-make-git-snapshot.sh
 
 # for snapshots only: don't run configure at the end of autogen.sh
-#Patch0:  %{name}-noconf.patch
+Patch0:  %{name}-noconf.patch
+
+# fix broken last.fm integration
+# https://bugzilla.gnome.org/show_bug.cgi?id=604783
+Patch1: %{name}-20091216-last.fm.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,7 +89,7 @@ BuildRequires: autoconf automake libtool
 
 
 
-Requires:      podsleuth
+Requires:      podsleuth >= 0.6.6
 Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 
@@ -136,16 +140,17 @@ developing applications that use %{name}-musicbrainz.
 
 
 %prep
-%setup -q -n %{name}-1-%{version}
-#setup -q -n %{name}-%{gitdate}
+#%setup -q -n %{name}-1-%{version}
+%setup -q -n %{name}-%{gitdate}
 # Snapshots only
-#patch0 -p1 -b .noconf
+%patch0 -p1 -b .noconf
+%patch1 -p1 -b .lastfm-fix
 cp -p %{SOURCE1} .
 
 %build
 export MONO_SHARED_DIR=%mono_shared
 # Snapshots only
-#./autogen.sh
+./autogen.sh
 %configure  --disable-docs --enable-mtp --enable-ipod --enable-podcast \
 %ifnarch %ix86 x86_64 sparc
             --disable-boo \
@@ -198,7 +203,7 @@ fi
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
 # ChangeLog not in snapshot
-%doc ChangeLog
+# %doc ChangeLog
 %doc COPYING AUTHORS README README.Fedora NEWS
 %{_bindir}/banshee-1
 %{_bindir}/muinshee
@@ -227,6 +232,11 @@ fi
 
 
 %changelog
+* Wed Dec 16 2009 Christian Krause <chkr@fedoraproject.org> - 1.5.3-0.1.20091216git
+- Update to latest snapshot to pick up DeviceKit-disks integration
+  to fix iPod support (BZ 495240)
+- Add a minor patch to fix the last.fm integration
+
 * Tue Nov 24 2009 Christian Krause <chkr@fedoraproject.org> - 1.5.2-1
 - Update to final 1.5.2 release
 
diff --git a/sources b/sources
index 8d636b6..cdb04bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-679042321ac3e809a48304f084ce7cf9  banshee-1-1.5.2.tar.bz2
+ec079910af580ddbe9910856ca7b8f24  banshee-20091216.tar.bz2