From ae4845395d213f2b36c37948bae5764dd747f205 Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr@fedoraproject.org>
Date: Mar 29 2011 19:29:07 +0000
Subject: Update to development release 1.9.5


---

diff --git a/.gitignore b/.gitignore
index dcba190..aff9487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ banshee-1-1.7.4.tar.bz2
 /banshee-1-1.9.3.tar.bz2
 /banshee-1-1.9.4.tar.bz2
 /banshee-1-1.9.5.tar.bz2
+/banshee-1.9.6.tar.bz2
diff --git a/banshee.spec b/banshee.spec
index 211b0a4..63562f7 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -1,11 +1,10 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
-%global mainver 1.9.5
 
 #%global gitdate 20091216
 #%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
 
 Name:    banshee
-Version: %{mainver}%{?patchver}
+Version: 1.9.6
 #Release: 0.1.%{gitdate}git%{?dist}
 Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
@@ -17,7 +16,7 @@ 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/unstable/%{mainver}/banshee-1-%{version}.tar.bz2
+Source0: http://download.banshee-project.org/banshee/unstable/%{version}/banshee-%{version}.tar.bz2
 Source1: README.Fedora
 #Source2: %{name}-make-git-snapshot.sh
 
@@ -150,7 +149,7 @@ MeeGo toolbar. From the Banshee panel, you have quick access to your music
 and play queue sources.
 
 %prep
-%setup -q -n %{name}-1-%{version}
+%setup -q
 #%setup -q -n %{name}-%{gitdate}
 # Snapshots only
 #%patch0 -p1 -b .noconf
@@ -190,9 +189,9 @@ find $RPM_BUILD_ROOT -name '*.config' -exec chmod a-x {} \;
 desktop-file-install --vendor gnome --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  %{buildroot}%{_datadir}/applications/banshee-1.desktop
+  %{buildroot}%{_datadir}/applications/banshee.desktop
 
-%find_lang %name-1
+%find_lang %name
 
 %post
 update-desktop-database &> /dev/null || :
@@ -211,48 +210,51 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files -f %{name}-1.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 # ChangeLog not in snapshot
 %doc ChangeLog
 %doc COPYING AUTHORS README README.Fedora NEWS
-%{_bindir}/banshee-1
+%{_bindir}/banshee
 %{_bindir}/muinshee
 %{_bindir}/bamz
-%exclude %{_libdir}/banshee-1/MusicBrainz.dll*
-%exclude %{_libdir}/banshee-1/MeeGo.exe*
-%exclude %{_libdir}/banshee-1/Extensions/Banshee.MeeGo.dll*
-%{_libdir}/banshee-1
+%exclude %{_libdir}/banshee/MusicBrainz.dll*
+%exclude %{_libdir}/banshee/MeeGo.exe*
+%exclude %{_libdir}/banshee/Extensions/Banshee.MeeGo.dll*
+%{_libdir}/banshee
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.bansheeproject.Banshee.service
 %{_datadir}/dbus-1/services/org.bansheeproject.CollectionIndexer.service
-%{_datadir}/banshee-1/
+%{_datadir}/banshee/
 %{_datadir}/icons/hicolor/*/apps/media-player-banshee.png
 %{_datadir}/gnome/help/banshee
 %{_datadir}/mime/packages/*
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
-%{_libdir}/pkgconfig/banshee-1-*.pc
+%exclude %{_libdir}/pkgconfig/banshee-musicbrainz.pc
+%{_libdir}/pkgconfig/banshee-*.pc
 
 %files musicbrainz
 %defattr(-,root,root,-)
-%{_libdir}/banshee-1/MusicBrainz.dll*
+%{_libdir}/banshee/MusicBrainz.dll*
 
 %files musicbrainz-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
+%{_libdir}/pkgconfig/banshee-musicbrainz.pc
 
 %files meego
 %defattr(-,root,root,-)
 %{_datadir}/mutter-meego/panels/*
 %{_libexecdir}/meego*
-%{_libdir}/banshee-1/MeeGo.exe*
-%{_libdir}/banshee-1/Extensions/Banshee.MeeGo.dll*
+%{_libdir}/banshee/MeeGo.exe*
+%{_libdir}/banshee/Extensions/Banshee.MeeGo.dll*
 %{_datadir}/dbus-1/services/com.meego.*
 
 %changelog
+* Tue Mar 29 2011 Christian Krause <chkr@fedoraproject.org> - 1.9.6-1
+- Update to development release 1.9.6
+
 * Thu Mar 10 2011 Christian Krause <chkr@fedoraproject.org> - 1.9.5-1
 - Update to development release 1.9.5
 
diff --git a/sources b/sources
index 2df87a4..90ddfd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72f50c97e89f68cdab9781dfd58105e0  banshee-1-1.9.5.tar.bz2
+97b41c2110a3d0b220a9f45e45e25675  banshee-1.9.6.tar.bz2