rpms/gnome-applet-music/FC-6 .cvsignore, 1.4, 1.5 gnome-applet-music.spec, 1.6, 1.7 sources, 1.4, 1.5

Fri Jan 19 23:58:47 UTC 2007

Author: pgordon

Update of /cvs/extras/rpms/gnome-applet-music/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27399

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to new upstream release (2.0.0)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- .cvsignore	22 Jun 2006 08:35:16 -0000	1.4
+++ .cvsignore	19 Jan 2007 23:58:17 -0000	1.5
@@ -1 +1 @@
-music-applet-0.9.2.tar.gz
+music-applet-2.0.0.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/FC-6/gnome-applet-music.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-music.spec	14 Jan 2007 23:09:59 -0000	1.6
+++ gnome-applet-music.spec	19 Jan 2007 23:58:17 -0000	1.7
@@ -1,26 +1,40 @@
-Name:           gnome-applet-music
-Version:        0.9.2
-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/
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define	python_module_name	musicapplet
+
+Name:		gnome-applet-music
+Version:	2.0.0
+Release:	1%{?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        
-http://web.ics.purdue.edu/~kuliniew/music-applet/downloads/music-applet-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	python-devel
+BuildRequires:	pygtk2-devel
 BuildRequires:	gnome-panel-devel
-BuildRequires:	eel2-devel
-BuildRequires:	dbus-devel
-BuildRequires:	gettext
+BuildRequires:	gnome-python2-devel
+BuildRequires:	GConf2
 BuildRequires:	perl(XML::Parser)
+BuildRequires:	gettext
+
+Requires:	dbus-python
+Requires:	gnome-python2-applet
+Requires:	gnome-python2-gconf
+Requires:	pygtk2
 
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires(pre):	GConf2
+
+Requires(post):	GConf2
+
+Requires(postun):	GConf2
+
+Provides:	music-applet
+Provides:	gnome-applet-rhythmbox
+Provides:	rhythmbox-applet
 
-Provides:       music-applet gnome-applet-rhythmbox rhythmbox-applet
 Obsoletes:      gnome-applet-rhythmbox
 
 %description
@@ -33,59 +47,75 @@
 
  * Banshee
  * Rhythmbox
+ * Muine
+ * XMMS2
 
 Music Applet is the successor to Rhythmbox Applet.
 
 %prep
-%setup -q -n music-applet-%{version}
+%setup -q -n "music-applet-%{version}"
+
 
 %build
-%configure
+%configure --disable-schemas-install
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 %find_lang music-applet
 
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %pre
 if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/music-applet.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
+	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+	gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/music-applet.schemas >/dev/null ||:
 fi
 
+
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/music-applet.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+	%{_sysconfdir}/gconf/schemas/music-applet.schemas >/dev/null ||:
+
 
 %preun
 if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/music-applet.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+	gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null ||:
 fi
 
+
 %files -f music-applet.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
-%{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/music-applet
-%{_libdir}/bonobo/servers/*.server
-%{_libexecdir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
+%doc AUTHORS ChangeLog COPYING FAQ NEWS README README.plugins THANKS   
+%config(noreplace) %{_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}/
+%dir %{python_sitelib}/%{python_module_name}/plugins
+%exclude %{python_sitelib}/%{python_module_name}/*.la
+%{python_sitelib}/%{python_module_name}/*.py*
+%{python_sitelib}/%{python_module_name}/plugins/*.py*
+%{python_sitelib}/%{python_module_name}/*.so
+%{_libexecdir}/music-applet
+%{_datadir}/music-applet/
+
 
 %changelog
-* Sun Jan 14 2006 Peter Gordon <peter at thecodergeek.com>
-- Update URL to new domain of upstream. 
+* Fri Jan 18 2007 Peter Gordon <peter at thecodergeek.com> - 2.0.0-1
+- Update to new upstream release (2.0.0) 
+- Update URL to new domain of upstream.
+- Lots of aesthetic updates to this spec file; and use macros rather than
+  RPM_* variables. 
 
 * Sun Sep 03 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.2-2
 - Add gettext and perl(XML::Parser) to BuildRequires (fixes bug #197924: fails


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-music/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2006 08:35:16 -0000	1.4
+++ sources	19 Jan 2007 23:58:17 -0000	1.5
@@ -1 +1 @@
-20fb34bbedd37cfb3b3624e098744a17  music-applet-0.9.2.tar.gz
+b1a6435828cef91fa1fe61b78acdb8b5  music-applet-2.0.0.tar.gz


