[control-center/f20-gnome-3-12] Update to 3.12.0

[Richard Hughes]

commit 8d931e8a07afa6c15c34e5d0e5b0567c36929a71
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Apr 14 16:19:21 2014 +0100

    Update to 3.12.0

 .gitignore                                         |    1 +
 ...shell-Set-iconview-number-of-columns-to-6.patch |   26 ---------------
 ...prove-logged-in-check-when-deleting-users.patch |   33 --------------------
 control-center.spec                                |   26 +++++++--------
 sources                                            |    2 +-
 5 files changed, 14 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8465586..05a3f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ gnome-control-center-2.31.6.tar.bz2
 /gnome-control-center-3.10.0.tar.xz
 /gnome-control-center-3.10.1.tar.xz
 /gnome-control-center-3.10.2.tar.xz
+/gnome-control-center-3.12.0.tar.xz
diff --git a/control-center.spec b/control-center.spec
index 17f7f84..bdbca4e 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,9 +1,9 @@
 %define gettext_package gnome-control-center-2.0
 
-%define glib2_version 2.37.7
-%define gtk3_version 3.9.12
+%define glib2_version 2.39.91
+%define gtk3_version 3.11.1
 %define gsd_version 3.7.3
-%define gnome_desktop_version 3.9.90
+%define gnome_desktop_version 3.11.3
 %define desktop_file_utils_version 0.9
 %define redhat_menus_version 1.8
 %define gnome_menus_version 3.7.90
@@ -11,21 +11,17 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 3.10.2
-Release: 4%{?dist}
+Version: 3.12.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 #VCS: git:git://git.gnome.org/gnome-control-center
-Source: http://download.gnome.org/sources/gnome-control-center/3.10/gnome-control-center-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gnome-control-center/3.12/gnome-control-center-%{version}.tar.xz
 URL: http://www.gnome.org
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=695691
 Patch0: distro-logo.patch
 
-# upstream fix
-Patch1: 0001-shell-Set-iconview-number-of-columns-to-6.patch
-Patch2: 0001-users-Improve-logged-in-check-when-deleting-users.patch
-
 Requires: gnome-settings-daemon >= %{gsd_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
@@ -34,6 +30,8 @@ Requires: gnome-menus >= %{gnome_menus_version}
 Requires: gnome-desktop3 >= %{gnome_desktop_version}
 Requires: dbus-x11
 Requires: control-center-filesystem = %{epoch}:%{version}-%{release}
+Requires: glib2%{?_isa} >= %{glib2_version}
+Requires: gtk3%{?_isa} >= %{gtk3_version}
 # we need XRRGetScreenResourcesCurrent
 Requires: libXrandr >= %{libXrandr_version}
 # for user accounts
@@ -97,7 +95,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: systemd-devel
 BuildRequires: libpwquality-devel
 BuildRequires: ibus-devel
-BuildRequires: autoconf automake libtool
+BuildRequires: grilo-devel
 %ifnarch s390 s390x
 BuildRequires: gnome-bluetooth-devel >= 3.9.3
 BuildRequires: libwacom-devel
@@ -138,11 +136,8 @@ utilities.
 %prep
 %setup -q -n gnome-control-center-%{version}
 %patch0 -p1 -b .distro-logo
-%patch1 -p1 -b .window-size
-%patch2 -p1 -b .userdel
 
 %build
-autoreconf
 %configure \
         --disable-static \
         --disable-update-mimedb \
@@ -228,6 +223,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Apr 14 2014 Richard Hughes <rhughes at redhat.com> - 1:3.12.0-1
+- Update to 3.12.0
+
 * Fri Jan 10 2014 Matthias Clasen <mclasen at redhat.com> - 1:3.10.2-4
 - Improve the user deletion dialog
 
diff --git a/sources b/sources
index 9c5504c..8302a18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6586da17988b918f367a7ad5cb95136  gnome-control-center-3.10.2.tar.xz
+d1c0a71bad910e0c03975f5597220d23  gnome-control-center-3.12.0.tar.xz