[control-center] Sync with f16

[Matthias Clasen]

commit e28f56c6168d054392e2bcc185ef7b4a730abdcd
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 31 08:54:20 2011 -0400

    Sync with f16

 .gitignore          |    1 +
 control-center.spec |   12 ++++++------
 sources             |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db71f91..fef57ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ gnome-control-center-2.31.6.tar.bz2
 /gnome-control-center-3.1.3.tar.xz
 /gnome-control-center-3.1.4.tar.xz
 /gnome-control-center-3.1.5.tar.xz
+/gnome-control-center-3.1.90.tar.xz
diff --git a/control-center.spec b/control-center.spec
index ae7ff94..f6cf0af 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -16,8 +16,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 3.1.5
-Release: 3%{?dist}
+Version: 3.1.90
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -25,9 +25,6 @@ Group: User Interface/Desktops
 Source: http://download.gnome.org/sources/gnome-control-center/3.1/gnome-control-center-%{version}.tar.xz
 URL: http://www.gnome.org
 
-# upstream fix
-Patch0: 0001-region-avoid-a-crash-in-the-absence-of-configured-la.patch
-
 Requires: gnome-settings-daemon >= 2.21.91-3
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
@@ -122,7 +119,6 @@ utilities.
 
 %prep
 %setup -q -n gnome-control-center-%{version}
-%patch0 -p1
 
 %build
 autoreconf -f
@@ -220,6 +216,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/control-center-1/panels/libsound.so
 %{_libdir}/control-center-1/panels/libuniversal-access.so
 %{_libdir}/control-center-1/panels/libuser-accounts.so
+%{_libdir}/control-center-1/panels/libwacom-properties.so
 %{_libdir}/libgnome-control-center.so
 %{_datadir}/pixmaps/faces
 
@@ -230,6 +227,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Wed Aug 31 2011 Matthias Clasen <mclasen at redhat.com> 3.1.90-1
+- Update to 3.1.90
+
 * Mon Aug 22 2011 Matthias Clasen <mclasen at redhat.com> 3.1.5-3
 - Fix a crash without configured layouts
 
diff --git a/sources b/sources
index 6b69b07..8db8d06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c514c2e5f6b480097f754f548b6cf2a  gnome-control-center-3.1.5.tar.xz
+612fae4fcfdb8c9479e6cafb091d4794  gnome-control-center-3.1.90.tar.xz