From 5db68ca084776d8dfcb0a2a0e971ed1346bbe154 Mon Sep 17 00:00:00 2001
From: chkr <chkr@fedoraproject.org>
Date: Jun 18 2010 20:50:28 +0000
Subject: - avoid "DllNotFoundException: libbnpx11" when switching to fullscreen mode


---

diff --git a/0001-Add-usr-lib-banshee-1-Backends-to-library-path.patch b/0001-Add-usr-lib-banshee-1-Backends-to-library-path.patch
new file mode 100644
index 0000000..6d02fa2
--- /dev/null
+++ b/0001-Add-usr-lib-banshee-1-Backends-to-library-path.patch
@@ -0,0 +1,29 @@
+From ef90643d5af60f4f0e07360fdcb2a9769ed01404 Mon Sep 17 00:00:00 2001
+From: Christian Krause <chkr@plauener.de>
+Date: Fri, 18 Jun 2010 21:51:11 +0200
+Subject: [PATCH] Add /usr/lib/banshee-1/Backends/ to library path
+
+- mono runtime needs to find libbnpx11.so imported by
+Banshee.NowPlaying.X11.dll
+- extend LD_LIBRARY_PATH in banshee startup script to
+include /usr/lib/banshee-1/Backends
+---
+ src/Clients/Booter/banshee-1.linux.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Clients/Booter/banshee-1.linux.in b/src/Clients/Booter/banshee-1.linux.in
+index 86e55d1..af85d8f 100644
+--- a/src/Clients/Booter/banshee-1.linux.in
++++ b/src/Clients/Booter/banshee-1.linux.in
+@@ -7,7 +7,7 @@ MONO_EXE="@expanded_libdir@/@PACKAGE@/$exec_asm"
+ BANSHEE_EXEC_NAME=$(basename $0)
+ BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1"
+ 
+-export LD_LIBRARY_PATH=@expanded_libdir@:@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
++export LD_LIBRARY_PATH=@expanded_libdir@:@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions:@expanded_libdir@/@PACKAGE@/Backends${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+ export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH}
+ if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then
+     BANSHEE_CLIENT="Muinshee"
+-- 
+1.6.6.1
+
diff --git a/banshee.spec b/banshee.spec
index 548cc67..d670117 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -7,7 +7,7 @@
 Name:    banshee
 Version: %{mainver}%{?patchver}
 #Release: 0.1.%{gitdate}git%{?dist}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -24,6 +24,10 @@ Source1: README.Fedora
 # for snapshots only: don't run configure at the end of autogen.sh
 #Patch0:  %{name}-noconf.patch
 
+# avoid DllNotFoundException: libbnpx11
+# https://bugzilla.gnome.org/show_bug.cgi?id=622028
+Patch1: 0001-Add-usr-lib-banshee-1-Backends-to-library-path.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We dont have mono on these arches:
@@ -139,6 +143,7 @@ developing applications that use %{name}-musicbrainz.
 #%setup -q -n %{name}-%{gitdate}
 # Snapshots only
 #%patch0 -p1 -b .noconf
+%patch1 -p1 -b .ldlibdir_fix
 cp -p %{SOURCE1} .
 
 
@@ -228,7 +233,11 @@ fi
 
 
 %changelog
-* Thu Jun 17 2010 Bastien Nocera <bnocera@redhat.com> -3
+* Fri Jun 18 2010 Christian Krause <chkr@fedoraproject.org> - 1.6.1-4
+- avoid "DllNotFoundException: libbnpx11" when switching to
+  fullscreen mode
+
+* Thu Jun 17 2010 Bastien Nocera <bnocera@redhat.com> - 1.6.1-3
 - Require libmtp-hal package to get device information, to be
   removed when banshee uses udev