- 0.9.5, updated deps and file list, (re)generate icon cache

  note: depends on unreleased libgpod 0.3.3

Changed files:
    rhythmbox.spec -> 1.63

diff --git a/rhythmbox.spec b/rhythmbox.spec
index a863a36c0ecedad50d1ba9e61615a884e822bb4d..1b0cdbf3d5f15a7f97e51bfc5581133cd6943257 100644 (file)
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -5,12 +5,12 @@
 Summary:       Music Management Application
 Summary(pl):   Aplikacja do zarz±dzania muzyk±
 Name:          rhythmbox
-Version:       0.9.4.1
-Release:       7
+Version:       0.9.5
+Release:       1
 License:       GPL v2+
 Group:         Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2
-# Source0-md5: d725eb7134d1997efe28285715ebc05e
+# Source0-md5: ff55e1db114321b7bdd6e21df1879367
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-broken_locale.patch
 Patch2:                %{name}-gtk2.8-crash.patch
@@ -19,43 +19,42 @@ Patch4:             %{name}-use-icon-name.patch
 URL:           http://www.rhythmbox.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: avahi-glib-devel
-BuildRequires: dbus-glib-devel >= 0.60
-BuildRequires: gnome-vfs2-devel >= 2.14.0
-BuildRequires: gstreamer-devel >= 0.10.2
+BuildRequires: avahi-glib-devel >= 0.6.10
+BuildRequires: dbus-glib-devel >= 0.62
+BuildRequires: gnome-vfs2-devel >= 2.15.2
+BuildRequires: gstreamer-devel >= 0.10.8
 BuildRequires: gstreamer-GConf >= 0.10
-BuildRequires: gstreamer-plugins-base-devel >= 0.10
-BuildRequires: gtk+2-devel >= 2:2.8.0
-BuildRequires: hal-devel >= 0.5.4
+BuildRequires: gstreamer-plugins-base-devel >= 0.10.7
+BuildRequires: gtk+2-devel >= 2:2.9.3
+BuildRequires: hal-devel >= 0.5.7
 BuildRequires: intltool
-BuildRequires: libbonobo-devel >= 2.14.0
 BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.14.0
-%{?with_ipod:BuildRequires:    libgpod-devel >= 0.3.0}
+BuildRequires: libgnomeui-devel >= 2.15.1
+%{?with_ipod:BuildRequires:    libgpod-devel >= 0.3.3}
 BuildRequires: libmusicbrainz-devel >= 2.0.1
 BuildRequires: libnotify-devel >= 0.4.0
-BuildRequires: libsexy-devel >= 0.1.5
-BuildRequires: libsoup-devel
+BuildRequires: libsexy-devel >= 0.1.8
+BuildRequires: libsoup-devel >= 2.2.94
 BuildRequires: libtool
-BuildRequires: nautilus-cd-burner-devel >= 2.14.0.1-2
+BuildRequires: nautilus-cd-burner-devel >= 2.15.3
 BuildRequires: pkgconfig
-BuildRequires: python-pygtk-devel >= 2.6.0
+BuildRequires: python-pygtk-devel >= 2.9.0
 BuildRequires: rpmbuild(macros) >= 1.176
 BuildRequires: scrollkeeper
-BuildRequires: totem-devel >= 1.1.3
+BuildRequires: totem-devel >= 1.5.2
 BuildRequires: zlib-devel
 %pyrequires_eq python-modules
-Requires(post,preun):  GConf2
+Requires(post,preun):  GConf2 >= 2.14.0
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
-Requires:      dbus >= 0.60
-Requires:      gstreamer-audio-effects-base >= 0.10
+Requires:      dbus >= 0.62
+Requires:      gstreamer-audio-effects-base >= 0.10.7
 Requires:      gstreamer-audio-formats >= 0.10.3
 Requires:      gstreamer-audiosink
-Requires:      gstreamer-gnomevfs >= 0.10
+Requires:      gstreamer-gnomevfs >= 0.10.7
 Requires:      gstreamer-plugins-good >= 0.10.3
-Requires:      gtk+2 >= 2:2.6.3
-Requires:      libgnomeui >= 2.14.1
+Requires:      gtk+2 >= 2:2.9.3
+Requires:      libgnomeui >= 2.15.1
 Obsoletes:     net-rhythmbox
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,8 +78,12 @@ muzyczn
 rm po/{ar,mn}.po
 
 %build
-%{__intltoolize}
+# for snapshots
+gnome-doc-prepare --copy
+%{__gtkdocize}
+%{__gnome_doc_common}
 %{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I macros
 %{__autoheader}
@@ -104,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+#rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 # there is no -devel subpackage, so we don't need APIdocs
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
@@ -113,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
 
 rm -f  $RPM_BUILD_ROOT%{_libdir}/bonobo/lib*.{la,a}
 rm -f  $RPM_BUILD_ROOT%{_libdir}/rhythmbox/plugins/*.{a,la,py}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/rhythmbox/plugins/artdisplay/*.py
 rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
@@ -123,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install rhythmbox.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %banner %{name} -e << EOF
 Remember to install appropriate GStreamer plugins for files
 you want to play:
@@ -132,32 +137,31 @@ you want to play:
 - gstreamer-neon (for HTTP streams)
 EOF
 
+%preun
+%gconf_schema_uninstall rhythmbox.schemas
+
 %postun 
 %scrollkeeper_update_postun
 %update_desktop_database_postun
-
-%preun
-%gconf_schema_uninstall rhythmbox.schemas
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %files -f rhythmbox.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README NEWS
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/bonobo/*.so
 %attr(755,root,root) %{_libdir}/rhythmbox-metadata
 
 %dir %{_libdir}/rhythmbox
 %dir %{_libdir}/rhythmbox/plugins
+%dir %{_libdir}/rhythmbox/plugins/artdisplay
 %attr(755,root,root) %{_libdir}/rhythmbox/plugins/*.so
+%{_libdir}/rhythmbox/plugins/artdisplay/*.py[co]
 %{_libdir}/rhythmbox/plugins/*-plugin
 %{_libdir}/rhythmbox/plugins/*.py[co]
 
-%{_datadir}/idl/*
 %{_datadir}/%{name}
 %{_datadir}/dbus-1/services/*.service
 %{_desktopdir}/*
-%{_libdir}/bonobo/servers/*
+%{_iconsdir}/hicolor/*/*/rhythmbox.png
 %{_omf_dest_dir}/%{name}
-%{_pixmapsdir}/*
-%{_pkgconfigdir}/*
 %{_sysconfdir}/gconf/schemas/rhythmbox.schemas