[sonata/f20] fix BZ#1071635

[Luis Enrique Bazán De León]

commit 74439bc26b257fd18bc4cacdc167ac45d6edd832
Author: lbazan <lbazan at fedoraproject.org>
Date:   Wed Mar 5 14:11:38 2014 -0500

    fix BZ#1071635

 sonata-1.6.2.1-mpd-0.18.patch |   34 ++++++++++++++++++++++++++++++++++
 sonata.spec                   |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/sonata-1.6.2.1-mpd-0.18.patch b/sonata-1.6.2.1-mpd-0.18.patch
new file mode 100644
index 0000000..9608228
--- /dev/null
+++ b/sonata-1.6.2.1-mpd-0.18.patch
@@ -0,0 +1,34 @@
+diff -Naur sonata-1.6.2.1/sonata/dbus_plugin.py sonata-1.6.2.1-new/sonata/dbus_plugin.py
+--- sonata-1.6.2.1/sonata/dbus_plugin.py	2009-09-21 02:58:57.000000000 -0300
++++ sonata-1.6.2.1-new/sonata/dbus_plugin.py	2013-11-02 07:47:32.612237971 -0200
+@@ -23,7 +23,9 @@
+ try:
+ 	import dbus, dbus.service
+ 	if getattr(dbus, "version", (0, 0, 0)) >= (0, 41, 0):
+-		import dbus.glib
++		from dbus.mainloop.glib import DBusGMainLoop
++		DBusGMainLoop(set_as_default=True)
++		#import dbus.glib
+ 	if getattr(dbus, "version", (0, 0, 0)) >= (0, 80, 0):
+ 		import _dbus_bindings as dbus_bindings
+ 		NEW_DBUS = True
+diff -Naur sonata-1.6.2.1/sonata/main.py sonata-1.6.2.1-new/sonata/main.py
+--- sonata-1.6.2.1/sonata/main.py	2009-09-21 02:58:57.000000000 -0300
++++ sonata-1.6.2.1-new/sonata/main.py	2013-11-02 07:48:21.232090538 -0200
+@@ -989,6 +989,7 @@
+ 						self.repeatmenu.set_active(self.status['repeat'] == '1')
+ 					if not self.last_random or self.last_random != self.status['random']:
+ 						self.randommenu.set_active(self.status['random'] == '1')
++					'''
+ 					if self.status['xfade'] == '0':
+ 						self.config.xfade_enabled = False
+ 					else:
+@@ -996,6 +997,8 @@
+ 						self.config.xfade = int(self.status['xfade'])
+ 						if self.config.xfade > 30:
+ 							self.config.xfade = 30
++					'''
++					self.config.xfade_enabled = False
+ 					self.last_repeat = self.status['repeat']
+ 					self.last_random = self.status['random']
+ 					return
diff --git a/sonata.spec b/sonata.spec
index 2177f14..5cedf1d 100644
--- a/sonata.spec
+++ b/sonata.spec
@@ -2,13 +2,14 @@
 
 Name:           sonata
 Version:        1.6.2.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        An elegant GTK+ client for the Music Player Daemon (MPD)
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://sonata.berlios.de/
 Source0:        http://download.berlios.de/sonata/sonata-%{version}.tar.bz2
 Patch0:         sonata-1.6.2-nocleaning.patch
+Patch1:         sonata-1.6.2.1-mpd-0.18.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  pygtk2-devel gtk2-devel
@@ -39,6 +40,7 @@ Features:
 %setup -q
 #workaround very odd cleaning at the end of setup.py
 %patch0 -p1 -b .nocleaning
+%patch1 -p1 -b .mpd-0.18
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Wed Mar 05 2014 Luis Bazan <lbazan at fedoraproject.org> - 1.6.2.1-11
+- fix BZ#1071635
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild