rpms/rhythmbox/FC-5 rhythmbox.spec,1.54,1.55 sources,1.23,1.24

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	rhythmbox.spec sources 
Log Message:
0.9.4



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-5/rhythmbox.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- rhythmbox.spec	8 Mar 2006 06:20:08 -0000	1.54
+++ rhythmbox.spec	17 Apr 2006 17:36:12 -0000	1.55
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.3.1
-Release: 3
+Version: 0.9.4
+Release: 1.fc5.1
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Requires: libgnomeui >= 2.6.0
 Requires: eel2 >= 2.0.0
 Requires: libgpod 
+Requires: scrollkeeper
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
@@ -27,8 +28,6 @@
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
-Patch0: rhythmbox-0.9.3.1-playlist.patch
-Patch1: rhythmbox-0.9.3.1-trayicon.patch
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
 
 %description
@@ -39,14 +38,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .playlist
-%patch1 -p1 -b .trayicon
 %patch2 -p1 -b .use-icon-name
 
 %build
 
-%configure --with-bonobo --with-ipod --with-dbus --with-mdns=avahi
-%{__make} %{?_smp_mflags}
+%configure \
+	--with-bonobo \
+	--with-ipod \
+	--with-dbus \
+	--with-mdns=avahi \
+	--disable-scrollkeeper
+make
 
 %install
 rm -rf %{buildroot}
@@ -55,6 +57,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -f %{buildroot}%{_libdir}/bonobo/*.{a,la}
 rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so
+rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*.{a,la}
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
@@ -80,10 +83,12 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 update-desktop-database %{_datadir}/applications
+scrollkeeper-update
 
 %postun
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
+scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -101,8 +106,14 @@
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
 %{_libdir}/pkgconfig/rhythmbox.pc
+%{_libdir}/rhythmbox/plugins
+%{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.4-1.fc5.1
+- Update to 0.9.4
+- Drop upstreamed patches
+
 * Wed Mar 08 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-3
 - fix icon on notification bubbles (bug 183720)
 - patch from CVS to escape bubble markup, found by 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	4 Feb 2006 20:10:49 -0000	1.23
+++ sources	17 Apr 2006 17:36:12 -0000	1.24
@@ -1 +1 @@
-0b63402c35c10de5581d79f5157a0739  rhythmbox-0.9.3.1.tar.bz2
+0d335864738d6de0d0e6acc2964f8bc4  rhythmbox-0.9.4.tar.bz2