[rhythmbox] Update to 2.99

[Kalev Lember]

commit 4eb999593171ce275032f8bab0fbdd8a68276dc3
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Apr 7 13:50:57 2013 +0200

    Update to 2.99

 .gitignore                                         |    1 +
 ...t-pane-plugin-when-webkit-isn-t-available.patch |   37 ----------
 automake-argh.patch                                |   12 ---
 rhythmbox-2.98-xinitthreads.patch                  |   76 --------------------
 rhythmbox.spec                                     |   72 ++++++------------
 sources                                            |    2 +-
 6 files changed, 26 insertions(+), 174 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a40b53b..76aa964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ rhythmbox-0.13.0.tar.bz2
 /rhythmbox-2.96.tar.xz
 /rhythmbox-2.97.tar.xz
 /rhythmbox-2.98.tar.xz
+/rhythmbox-2.99.tar.xz
diff --git a/rhythmbox.spec b/rhythmbox.spec
index 8aa43e8..a50743f 100644
--- a/rhythmbox.spec
+++ b/rhythmbox.spec
@@ -1,65 +1,54 @@
 %define desktop_file_utils_version 0.9
+%define gtk3_version 3.6.0
+%define libdmapsharing_version 2.9.16
 
 Name: rhythmbox
 Summary: Music Management Application
-Version: 2.98
-Release: 7%{?dist}
+Version: 2.99
+Release: 1%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
 #VCS: git://git.gnome.org/rhythmbox
-Source: http://download.gnome.org/sources/rhythmbox/2.98/%{name}-%{version}.tar.xz
-# https://bugzilla.gnome.org/show_bug.cgi?id=685945
-Patch0: Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=686320
-Patch1: rhythmbox-2.98-xinitthreads.patch
-# automake 1.13, argh
-Patch2: automake-argh.patch
-
-Requires: gtk3 >= 2.91.4
+Source: http://download.gnome.org/sources/rhythmbox/2.99/%{name}-%{version}.tar.xz
+
 Requires: gnome-icon-theme-legacy
+Requires: gtk3%{?_isa} >= %{gtk3_version}
+Requires: libdmapsharing%{?_isa} >= %{libdmapsharing_version}
 Requires: media-player-info
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(post): GConf2
-Requires(preun): GConf2
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires: gstreamer-python
 Requires: gvfs-afc gnome-icon-theme-extras
 Requires: pygobject3 python-mako
 
-BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: brasero-devel
-BuildRequires: clutter-gst-devel
+BuildRequires: clutter-gst2-devel
 BuildRequires: clutter-gtk-devel
-BuildRequires: dbus-devel >= 0.90
-BuildRequires: dbus-glib-devel >= 0.70
-BuildRequires: GConf2-devel
-BuildRequires: gettext, scrollkeeper
-BuildRequires: gnome-common
-BuildRequires: gnome-doc-utils
+BuildRequires: gettext
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: grilo-devel >= 0.2
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel >= 0.10
-BuildRequires: gstreamer-python-devel
+BuildRequires: gstreamer1-devel
+BuildRequires: gstreamer1-plugins-base-devel
+BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: intltool
+BuildRequires: itstool
 BuildRequires: json-glib-devel
 BuildRequires: kernel-headers
-BuildRequires: libdmapsharing-devel >= 2.9.11
-BuildRequires: libgnome-keyring-devel
+BuildRequires: libdmapsharing-devel >= %{libdmapsharing_version}
 BuildRequires: libgpod-devel
 BuildRequires: libgudev1-devel
 BuildRequires: libmtp-devel
 BuildRequires: libmx-devel
 BuildRequires: libnotify-devel
 BuildRequires: libpeas-devel
+BuildRequires: libsecret-devel
 BuildRequires: libSM-devel
-BuildRequires: libsoup-devel >= 2.3.0
+BuildRequires: libsoup-devel >= 2.26.0
 BuildRequires: libtdb-devel
 BuildRequires: lirc-devel
-BuildRequires: perl(XML::Parser) intltool
 BuildRequires: pygobject3-devel
-BuildRequires: python-devel
-BuildRequires: totem-pl-parser-devel >= 2.21.1
+BuildRequires: python2-devel
+BuildRequires: totem-pl-parser-devel >= 3.2.0
 BuildRequires: webkitgtk3-devel
 
 ExcludeArch:    s390 s390x
@@ -96,26 +85,10 @@ a Rhythmbox plugin.
 
 %prep
 %setup -q
-%patch0 -p1 -b .context_plugin_webkit
-%patch1 -p1 -b .xinitthreads
-%patch2 -p1 -b .automak
-
-autoreconf -fi
 
 %build
-
-# work around a gstreamer bug
-/usr/bin/gst-inspect-0.10 --print-all >& /dev/null || :
-
-# Temporarly disabled webkit support to prevent mixed gst-0.10 and gst-1.0
-# linkage in the same process. Should be reenabled once rhythmbox is ported to
-# gst-1.0.
 %configure \
       --with-ipod \
-      --with-mdns=avahi \
-      --disable-scrollkeeper \
-      --with-gnome-keyring \
-      --without-webkit \
       --without-hal
 
 make %{?_smp_mflags}
@@ -178,7 +151,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_libdir}/rhythmbox/plugins/audiocd/
 %{_libdir}/rhythmbox/plugins/audioscrobbler/
 %{_libdir}/rhythmbox/plugins/cd-recorder/
-#{_libdir}/rhythmbox/plugins/context/
+%{_libdir}/rhythmbox/plugins/context/
 %{_libdir}/rhythmbox/plugins/daap/
 %{_libdir}/rhythmbox/plugins/dbus-media-server/
 %{_libdir}/rhythmbox/plugins/fmradio/
@@ -213,6 +186,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Sun Apr 07 2013 Kalev Lember <kalevlember at gmail.com> 2.99-1
+- Update to 2.99
+
 * Sat Mar 30 2013 Peter Robinson <pbrobinson at fedoraproject.org> 2.98-7
 - Add missing files to fix FTBFS
 
diff --git a/sources b/sources
index 0187dae..6c82257 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1567bd790e9dd23fd63401c1c09e6249  rhythmbox-2.98.tar.xz
+1752bf303785a1704378078df5858145  rhythmbox-2.99.tar.xz