[control-center/f14/master] 2.31.6

[Matthias Clasen]

commit 62cb689a8fdc585278f22395be66bacd0de44c04
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 4 10:14:38 2010 -0400

    2.31.6

 .gitignore          |    1 +
 control-center.spec |   34 +++++++++++++++++++++++-----------
 sources             |    2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2927530..1467a8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-control-center-2.31.5.tar.bz2
+gnome-control-center-2.31.6.tar.bz2
diff --git a/control-center.spec b/control-center.spec
index bcc9cb4..a0abcb0 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.13.0
-%define gtk3_version 2.90.2
+%define gtk2_version 2.21
 %define gconf2_version 1.2.0
-%define gnome_desktop_version 2.90.4
+%define gnome_desktop_version 2.30
 %define desktop_file_utils_version 0.9
 %define xft_version 2.1.7
 %define fontconfig_version 1.0.0
@@ -17,8 +17,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.31.5
-Release: 2%{?dist}
+Version: 2.31.6
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -31,17 +31,17 @@ Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
 Requires: alsa-lib
 Requires: gnome-menus >= %{gnome_menus_version}
-Requires: gnome-desktop3 >= %{gnome_desktop_version}
+Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: dbus-x11
 Requires: control-center-filesystem = %{epoch}:%{version}-%{release}
 # we need XRRGetScreenResourcesCurrent
 Requires: libXrandr >= %{libXrandr_version}
 
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: librsvg2-devel
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
+BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libxklavier-devel >= %{libxklavier_version}
 BuildRequires: libXcursor-devel
@@ -197,21 +197,30 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_bindir}/gnome-typing-monitor
 %{_bindir}/gnome-font-viewer
 %{_bindir}/gnome-thumbnail-font
+%{_bindir}/gnome-appearance-properties
+%{_bindir}/gnome-at-properties
+%{_bindir}/gnome-default-applications-properties
+%{_bindir}/gnome-display-properties
+%{_bindir}/gnome-keybinding-properties
+%{_bindir}/gnome-keyboard-properties
+%{_bindir}/gnome-mouse-properties
+%{_bindir}/gnome-network-properties
+%{_bindir}/gnome-window-properties
 %{_libdir}/*.so.*
 %{_sysconfdir}/gconf/schemas/control-center.schemas
 %{_sysconfdir}/gconf/schemas/gnome-control-center.schemas
 %{_sysconfdir}/gconf/schemas/fontilus.schemas
 %{_sysconfdir}/xdg/menus/gnomecc.menu
 %{_sysconfdir}/xdg/autostart/gnome-at-session.desktop
-%{_libdir}/control-center-1
-%{_libdir}/libgnome-control-center.so
+%{_libdir}/window-manager-settings
+%{_libdir}/libgnome-window-settings.so
 %{_sbindir}/gnome-display-properties-install-systemwide
+%{_datadir}/mime/packages/gnome-theme-package.xml
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/gnome-control-center-1
+%{_includedir}/gnome-window-settings-2.0
 %{_libdir}/pkgconfig/*
-%{_datadir}/gtk-doc/html/libgnome-control-center
 
 %files filesystem
 %defattr(-,root,root)
@@ -222,6 +231,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Wed Aug  4 2010 Matthias Clasen <mclasen at redhat.com> 2.31.6-1
+- Update to 2.31.6
+
 * Wed Jul 21 2010 Bastien Nocera <bnocera at redhat.com> 2.31.5-2
 - Trim BuildRequires
 - Remove libgail-gnome dependency (#616632)
diff --git a/sources b/sources
index 098df1e..d6ad411 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f0a7fd64e181ebb90005c06092b45dd  gnome-control-center-2.31.5.tar.bz2
+19c820cfa036a06d1e7777e165e404bc  gnome-control-center-2.31.6.tar.bz2