[gnome-media/f14/master] * Wed Aug 04 2010 Bastien Nocera <bnocera at redhat.com> 2.31.6-1 - Update to 2.31.6

[Bastien Nocera]

commit 50e6c41247f0aa34099cb70c60bd6fdad83519fc
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Aug 4 14:48:06 2010 +0100

    * Wed Aug 04 2010 Bastien Nocera <bnocera at redhat.com> 2.31.6-1
    - Update to 2.31.6

 .gitignore                                         |    1 +
 ...mplete-the-GTK-3-port-by-using-unique-3.0.patch |   25 --
 0001-Fix-GConf-handling-in-sound-theme.patch       |  341 --------------------
 0001-Remove-libunique-3.0-dependency.patch         |   59 ----
 ...Use-correct-command-for-sound-preferences.patch |   26 --
 gnome-media.spec                                   |   23 +-
 sources                                            |    2 +-
 7 files changed, 9 insertions(+), 468 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bc36e7..b81e0a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-media-2.31.5.tar.bz2
+gnome-media-2.31.6.tar.bz2
diff --git a/gnome-media.spec b/gnome-media.spec
index d2d1c1d..fd7fe61 100644
--- a/gnome-media.spec
+++ b/gnome-media.spec
@@ -11,8 +11,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.31.5
-Release:        4%{?dist}
+Version:        2.31.6
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 #VCS: git:git://git.gnome.org/gnome-media
@@ -25,7 +25,7 @@ Requires(post): GConf2 >= 2.14
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
-BuildRequires:  gtk3-devel >= %{gtk2_version}
+BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  glade3-libgladeui-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
@@ -40,13 +40,6 @@ BuildRequires:  intltool
 BuildRequires:  control-center-devel
 BuildRequires:  scrollkeeper
 
-Patch0:         0001-Complete-the-GTK-3-port-by-using-unique-3.0.patch
-Patch1:         0001-Remove-libunique-3.0-dependency.patch
-BuildRequires:  automake autoconf libtool gnome-common intltool
-
-Patch2:         0001-Use-correct-command-for-sound-preferences.patch
-Patch3:         0001-Fix-GConf-handling-in-sound-theme.patch
-
 %description
 This package contains a few media utilities for the GNOME desktop,
 including a volume control and a configuration utility for audio profiles.
@@ -83,11 +76,6 @@ framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .unique3
-%patch1 -p1 -b .remove-unique
-%patch2 -p1 -b .panel
-%patch3 -p1 -b .gconf
-autoreconf -f
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -97,7 +85,7 @@ rm profiles/gnome-audio-profiles.schemas
         --disable-schemas-install \
         --enable-gnomecd=no \
         --enable-cddbslave=no
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -315,6 +303,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Wed Aug 04 2010 Bastien Nocera <bnocera at redhat.com> 2.31.6-1
+- Update to 2.31.6
+
 * Thu Jul 22 2010 Bastien Nocera <bnocera at redhat.com> 2.31.5-4
 - Fix GConf handling in sound theme editor (#617025)
 - Some minor bugs
diff --git a/sources b/sources
index c9fce28..0fcec50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8b2854b55ffe5e15c4ad3fa32b3a848  gnome-media-2.31.5.tar.bz2
+2d2516d9a8b25ce43bcc256a40a99ba0  gnome-media-2.31.6.tar.bz2