rpms/gnome-applet-music/devel .cvsignore, 1.6, 1.7 gnome-applet-music.spec, 1.13, 1.14 sources, 1.6, 1.7

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.2.0; various (mostly aesthetic) spec file fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Feb 2007 03:44:53 -0000	1.6
+++ .cvsignore	28 Jul 2007 09:09:54 -0000	1.7
@@ -1 +1 @@
-music-applet-2.1.0.tar.gz
+music-applet-2.2.0.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/devel/gnome-applet-music.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-applet-music.spec	11 May 2007 04:31:12 -0000	1.13
+++ gnome-applet-music.spec	28 Jul 2007 09:09:54 -0000	1.14
@@ -2,8 +2,8 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.1.0
-Release:	2%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 
 Group:		Applications/Multimedia
@@ -11,22 +11,32 @@
 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
-BuildRequires:	pygtk2-devel
+## The build script will give warnings about missing python modules, such as
+## gconf, gnomeapplet, Numeric, etc.; but these are entirely false positives.
+## These modules are only needed at runtime, hence are not included as
+## build-time dependencies.
+BuildRequires:	GConf2
+BuildRequires:	gettext
 BuildRequires:	gnome-panel-devel
 BuildRequires:	gnome-python2-devel
-BuildRequires:	GConf2
 BuildRequires:	perl(XML::Parser)
-BuildRequires:	gettext
+BuildRequires:	pygtk2-devel
+BuildRequires:	python-devel
 
+## The hicolor-icon-theme dependency is to ensure that the
+## %%_datadir/icons/hicolor directory hierarchy is properly owned. 
 Requires:	dbus-python >= 0.80
 Requires:	gnome-python2-applet
 Requires:	gnome-python2-gconf
+Requires:	gnome-python2-gnomekeyring
+Requires:	hicolor-icon-theme
+Requires:	notify-python
 Requires:	pygtk2
+Requires:	python-numeric
+Requires:	PyXML
 
 Requires(pre):	GConf2
 
@@ -34,11 +44,13 @@
 
 Requires(preun):	GConf2
 
-Provides:	music-applet
 Provides:	gnome-applet-rhythmbox
+Provides:	music-applet
 Provides:	rhythmbox-applet
 
-Obsoletes:      gnome-applet-rhythmbox
+Obsoletes:	gnome-applet-rhythmbox
+Obsoletes:	music-applet
+Obsoletes:	rhythmbox-applet
 
 %description
 Music Applet is a small, simple GNOME panel applet that lets you control a
@@ -46,20 +58,19 @@
 access to information about the current song and the most important playback
 controls.
 
-Music Applet currently supports the following music players:
-
+Music Applet is the successor to the Rhythmbox Applet and currently supports
+the following music players:
  * Banshee
  * Exaile
- * Rhythmbox
+ * MPD
  * Muine
- * XMMS2
-
-Music Applet is the successor to Rhythmbox Applet.
+ * Rhythmbox
+ * Quod Libet
+ * XMMS1 and XMMS2
 
 
 %prep
 %setup -q -n "music-applet-%{version}"
-%patch0 -p0 -b .fix-bug239373-Exaile-play_pause-skipping
 
 
 %build
@@ -114,9 +125,18 @@
 %{python_sitelib}/%{python_module_name}/*.so
 %{_libexecdir}/music-applet/
 %{_datadir}/music-applet/
+%{_datadir}/icons/hicolor/*/apps/music-applet-*
 
 
 %changelog
+* Sat Jul 28 2007 Peter Gordon <peter at thecodergeek.com> - 2.2.0-1
+- Update to new upstream release (2.2.0), and update %%description to note new
+  music player support.
+- Drop upstreamed Exaile play/pause bugfix:
+  - fix-Exaile-play_pause.patch
+- Sync Provides/Obsoletes, to provide proper upgrade paths for old package
+  names.
+
 * Mon May 07 2007 Peter Gordon <peter at thecodergeek.com> - 2.1.0-2
 - Add a patch from Nicholas Omann (already in upstream's BZR) to fix bug
   #239373 (Play/Pause button does not work for Exaile plugin):


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Feb 2007 03:44:53 -0000	1.6
+++ sources	28 Jul 2007 09:09:54 -0000	1.7
@@ -1 +1 @@
-7f4f37070886c4d75b1c162b362aef4c  music-applet-2.1.0.tar.gz
+9014e0a20471d98f38b1dbea848562a7  music-applet-2.2.0.tar.gz