rpms/rhythmbox/devel .cvsignore, 1.22, 1.23 rhythmbox.spec, 1.57, 1.58 sources, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26954

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
0.9.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Apr 2006 16:23:37 -0000	1.22
+++ .cvsignore	25 Apr 2006 18:39:52 -0000	1.23
@@ -7,3 +7,4 @@
 rhythmbox-0.9.3.tar.bz2
 rhythmbox-0.9.3.1.tar.bz2
 rhythmbox-0.9.4.tar.bz2
+rhythmbox-0.9.4.1.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rhythmbox.spec	17 Apr 2006 17:07:34 -0000	1.57
+++ rhythmbox.spec	25 Apr 2006 18:39:52 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.4
+Version: 0.9.4.1
 Release: 2
 License: GPL
 Group: Applications/Multimedia
@@ -13,7 +13,13 @@
 Requires: libgnomeui >= 2.6.0
 Requires: eel2 >= 2.0.0
 Requires: libgpod 
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
@@ -25,7 +31,7 @@
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: libnotify-devel
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
+
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
@@ -78,17 +84,21 @@
 %post 
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="rhythmbox.schemas"
-for S in $SCHEMAS; do 
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/rhythmbox.schemas >/dev/null
+update-desktop-database -q
+scrollkeeper-update -q
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/rhythmbox.schemas > /dev/null || :
+fi
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -110,6 +120,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Apr 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4.1-2
+- Update to 0.9.4.1
+
 * Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-2
 - Update to 0.9.4
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	17 Apr 2006 16:23:37 -0000	1.24
+++ sources	25 Apr 2006 18:39:52 -0000	1.25
@@ -1 +1 @@
-0d335864738d6de0d0e6acc2964f8bc4  rhythmbox-0.9.4.tar.bz2
+d725eb7134d1997efe28285715ebc05e  rhythmbox-0.9.4.1.tar.bz2