rpms/gnome-applet-rhythmbox/devel gnome-applet-rhythmbox.spec, 1.4, 1.5

Ignacio Vazquez-Abrams (ivazquez) fedora-extras-commits at redhat.com
Mon Feb 20 08:49:14 UTC 2006


Author: ivazquez

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

Modified Files:
	gnome-applet-rhythmbox.spec 
Log Message:
- Upstream update
- Fix GConf handling



Index: gnome-applet-rhythmbox.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-rhythmbox/devel/gnome-applet-rhythmbox.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-applet-rhythmbox.spec	14 Feb 2006 05:01:00 -0000	1.4
+++ gnome-applet-rhythmbox.spec	20 Feb 2006 08:49:13 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           gnome-applet-rhythmbox
-Version:        0.1.10
+Version:        0.1.11
 Release:        1%{?dist}
 Summary:        A GNOME panel applet to control Rhythmbox's playback
 
@@ -11,6 +11,9 @@
 
 BuildRequires:  gnome-panel-devel eel2-devel rhythmbox dbus-devel
 #Requires:       
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 Rhythmbox Applet is a small, simple GNOME panel applet that lets you control
@@ -25,12 +28,35 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang rhythmbox-applet
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/rhythmbox-applet.schemas >/dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/rhythmbox-applet.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/rhythmbox-applet.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
 %files -f rhythmbox-applet.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
@@ -41,6 +67,10 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Feb 20 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.1.11-1
+- Upstream update
+- Fix GConf handling
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.1.10-1
 - Upstream update
 




More information about the scm-commits mailing list