From 192f482c96a5fdaffa5296bc9cd7da94f77ac74a Mon Sep 17 00:00:00 2001
From: chkr <chkr@fedoraproject.org>
Date: Feb 03 2010 00:35:00 +0000
Subject: - Update to final 1.5.3 release

- Remove upstreamed patch (last.fm integration)

---

diff --git a/.cvsignore b/.cvsignore
index c3fd41c..77c3bd9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-banshee-20091216.tar.bz2
+banshee-1-1.5.3.tar.bz2
diff --git a/banshee.spec b/banshee.spec
index d7f96aa..7033e80 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -1,13 +1,13 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
 %global mainver 1.5.3
 
-%global gitdate 20091216
-%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
+#%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,17 +16,13 @@ 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
+#Source2: %{name}-make-git-snapshot.sh
 
 # for snapshots only: don't run configure at the end of autogen.sh
-Patch0:  %{name}-noconf.patch
-
-# fix broken last.fm integration
-# https://bugzilla.gnome.org/show_bug.cgi?id=604783
-Patch1: %{name}-20091216-last.fm.patch
+#Patch0:  %{name}-noconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,9 +64,6 @@ BuildRequires: gettext-devel intltool perl(XML::Parser)
 BuildRequires: boo-devel
 %endif
 
-# monotorrent-dbus not in Fedora yet
-
-%if 0%{?fedora} >= 11
 # Building with nunit installed causes banshee to require it at runtime
 #BuildRequires: mono-nunit-devel
 
@@ -80,8 +73,6 @@ BuildRequires: boo-devel
 BuildRequires: clutter-devel
 %endif # F-12 and up
 
-%endif # F-11 and up
-
 BuildRequires: desktop-file-utils
 
 # Snapshots only
@@ -115,7 +106,7 @@ developing extensions for %{name}.
 %package        musicbrainz
 Summary:        MusicBrainz libraries for the Banshee Media Framework
 Group:          System Environment/Libraries
-
+Requires:       %{name} = %{version}-%{release}
 %description    musicbrainz
 Banshee allows you to import CDs, sync your music collection to an iPod,
 play music directly from an iPod, create playlists with songs from your
@@ -140,17 +131,16 @@ 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
-%patch1 -p1 -b .lastfm-fix
+#%patch0 -p1 -b .noconf
 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 \
@@ -160,9 +150,7 @@ export MONO_SHARED_DIR=%mono_shared
 make %{?_smp_mflags}
 
 %check
-%if 0%{?fedora} >= 11
 make check
-%endif
 
 %install
 %{__rm} -rf %{buildroot}
@@ -203,7 +191,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
@@ -232,6 +220,10 @@ fi
 
 
 %changelog
+* Wed Feb 03 2010 Christian Krause <chkr@fedoraproject.org> - 1.5.3-1
+- Update to final 1.5.3 release
+- Remove upstreamed patch (last.fm integration)
+
 * 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)
diff --git a/sources b/sources
index cdb04bd..5e16037 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec079910af580ddbe9910856ca7b8f24  banshee-20091216.tar.bz2
+953124a1be0e9299f092dbf2f9742376  banshee-1-1.5.3.tar.bz2