rpms/gnome-applet-music/devel gnome-applet-music-fix-Exaile-play_pause.patch, NONE, 1.1 gnome-applet-music.spec, 1.11, 1.12

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/gnome-applet-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3681

Modified Files:
	gnome-applet-music.spec 
Added Files:
	gnome-applet-music-fix-Exaile-play_pause.patch 
Log Message:
Fix bug #239373, plus some spec file cleanups. See %changelog entry for details.

gnome-applet-music-fix-Exaile-play_pause.patch:

--- NEW FILE gnome-applet-music-fix-Exaile-play_pause.patch ---
--- src/musicapplet/plugins/exaile.py.old	2007-05-07 
17:29:48.000000000 -0500
+++ src/musicapplet/plugins/exaile.py	2007-05-07 19:26:26.000000000 -0500
@@ -71,7 +71,7 @@
 
 
     def toggle_playback (self):
-        self.__player.play (reply_handler=lambda: None,
+        self.__player.play_pause (reply_handler=lambda: None,
                             error_handler=self._report_dbus_error)
 
 


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/devel/gnome-applet-music.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-applet-music.spec	12 Feb 2007 03:44:53 -0000	1.11
+++ gnome-applet-music.spec	11 May 2007 04:24:35 -0000	1.12
@@ -1,15 +1,18 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define	python_module_name	musicapplet
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
 Version:	2.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GNOME panel applet to control various music players
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.kuliniewicz.org/music-applet/
+
 Source0:	http://www.kuliniewicz.org/music-applet/downloads/music-applet-%{version}.tar.gz        
+Patch0:		%{name}-fix-Exaile-play_pause.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python-devel
@@ -46,6 +49,7 @@
 Music Applet currently supports the following music players:
 
  * Banshee
+ * Exaile
  * Rhythmbox
  * Muine
  * XMMS2
@@ -54,6 +58,7 @@
 
 %prep
 %setup -q -n "music-applet-%{version}"
+%patch0 -p0 -b .fix-bug239373-Exaile-play_pause-skipping
 
 
 %build
@@ -90,14 +95,14 @@
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null ||:
+		%{_sysconfdir}/gconf/schemas/music-applet.schemas >/dev/null ||:
 fi
 
 
 %files -f music-applet.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS README README.plugins THANKS   
-%config(noreplace) %{_sysconfdir}/gconf/schemas/music-applet.schemas
+%{_sysconfdir}/gconf/schemas/music-applet.schemas
 %{_libdir}/bonobo/servers/GNOME_Music_Applet.server
 %{_libdir}/gnome-2.0/ui/GNOME_Music_Applet.xml
 %dir %{python_sitelib}/%{python_module_name}/
@@ -106,11 +111,20 @@
 %{python_sitelib}/%{python_module_name}/*.py*
 %{python_sitelib}/%{python_module_name}/plugins/*.py*
 %{python_sitelib}/%{python_module_name}/*.so
-%{_libexecdir}/music-applet
+%{_libexecdir}/music-applet/
 %{_datadir}/music-applet/
 
 
 %changelog
+* Mon May 07 2007 Peter Gordon <peter at thecodergeek.com> - 2.1.0-2
+- Add a patch from Nicholas Omann to fix bug #239373 (Play/Pause button does
+  not work for Exaile plugin):
+  + fix-Exaile-play_pause.patch
+- Update the %%description to note that it supports Exaile. :)
+- Don't mark the installed GConf schemas file as %%config(noreplace).
+- Fix %%preun scriplet to use music-applet.schemas instead of "[NAME].spec" in
+  the gconftool-2 invocation.
+
 * Sun Feb 11 2007 Peter Gordon <peter at thecodergeek.com> - 2.1.0-1
 - Update to new upstream release (2.1.0); which includes a fix for 64-bit
   plugin loading. See the included documentation (ChangeLog) for more