[banshee] Update banshee to 1.7.4

[Nathaniel McCallum]

commit 4b4fd2dce1887f12520b40aac0d8316635c5d1b3
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Fri Oct 1 16:44:45 2010 -0400

    Update banshee to 1.7.4

 .gitignore                                     |    1 +
 banshee-1-1.7.4-build.patch                    |   50 -
 banshee-1.7.4-no-update-desktop-database.patch |   12 -
 banshee-1.7.4-no-update-mime-database.patch    |   14 -
 banshee-1.7.6-no-update-desktop-database.patch |   12 +
 banshee-20091216-last.fm.patch                 |   14 -
 banshee.spec                                   |   26 +-
 sources                                        |    2 +-
 update-translation-es-b1a2c57a13.diff          | 2177 ------------------------
 9 files changed, 30 insertions(+), 2278 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 139e900..035a765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 banshee-1-1.6.1.tar.bz2
 banshee-1-1.7.4.tar.bz2
+/banshee-1-1.7.6.tar.bz2
diff --git a/banshee-1.7.6-no-update-desktop-database.patch b/banshee-1.7.6-no-update-desktop-database.patch
new file mode 100644
index 0000000..b1eb656
--- /dev/null
+++ b/banshee-1.7.6-no-update-desktop-database.patch
@@ -0,0 +1,12 @@
+diff -Nru banshee-1-1.7.6.orig/data/desktop-files/Makefile.in banshee-1-1.7.6/data/desktop-files/Makefile.in
+--- banshee-1-1.7.6.orig/data/desktop-files/Makefile.in	2010-09-15 17:07:53.000000000 -0400
++++ banshee-1-1.7.6/data/desktop-files/Makefile.in	2010-09-29 14:48:04.810019173 -0400
+@@ -606,8 +606,6 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-install-data-hook:
+-	test -z $(DESTDIR) && update-desktop-database $(DESTDIR)$(datadir)/applications || :
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/banshee.spec b/banshee.spec
index 9a555d8..6d45af5 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -1,5 +1,5 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
-%global mainver 1.7.4
+%global mainver 1.7.6
 
 #%global gitdate 20091216
 #%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
@@ -7,7 +7,7 @@
 Name:    banshee
 Version: %{mainver}%{?patchver}
 #Release: 0.1.%{gitdate}git%{?dist}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -25,10 +25,7 @@ Source1: README.Fedora
 #Patch0:  %{name}-noconf.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=625264
-Patch1: banshee-1.7.4-no-update-mime-database.patch
-Patch2: banshee-1.7.4-no-update-desktop-database.patch
-# build fix, already applied upstream
-Patch3: banshee-1-1.7.4-build.patch
+Patch1: banshee-1.7.6-no-update-desktop-database.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,11 +44,14 @@ BuildRequires: gstreamer-devel >= 0.10
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gstreamer-plugins-good >= 0.10
 BuildRequires: libmtp-devel >= 0.2.0
-BuildRequires: webkit-sharp-devel
+
+# Web Browser
+BuildRequires: webkitgtk-devel
 
 # Sharp
 BuildRequires: gtk-sharp2-devel taglib-sharp-devel
 BuildRequires: gnome-sharp-devel notify-sharp-devel
+BuildRequires: libgpod-sharp-devel
 %ifnarch s390 s390x
 BuildRequires: ipod-sharp-devel >= 0.8.5
 %endif
@@ -148,9 +148,7 @@ developing applications that use %{name}-musicbrainz.
 # Snapshots only
 #%patch0 -p1 -b .noconf
 cp -p %{SOURCE1} .
-%patch1 -p1 -b .no-update-mime-database
-%patch2 -p1 -b .no-update-desktop-database
-%patch3 -p1 -b .build-fix
+%patch1 -p1 -b .no-update-desktop-database
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -239,6 +237,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Oct 01 2010 Nathaniel McCallum <nathaniel at natemccallum.com> - 1.7.6-1
+- Update to 1.7.6
+- Remove upstreamed build fix patch
+- Remove upstreamed mimedb patch
+- Update desktop-database patch to apply against 1.7.6
+- Fix gtkwebkit dependency to enable web music stores
+- Add libgpod-sharp to build requires
+
 * Fri Oct 01 2010 Dan Horák <dan[at]danny.cz> - 1.7.4-3
 - Fix BRs and configure options on s390(x) and ppc(64)
 
diff --git a/sources b/sources
index 538c40e..46f5eb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-364eb71089d3268591a53c8211daa9d4  banshee-1-1.7.4.tar.bz2
+2d0d0a385937e3673e99eada45d6c63f  banshee-1-1.7.6.tar.bz2