From 53abf6f4c9c2dc9d50e1e0b527ae40a13c21d381 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jul 15 2005 20:06:59 +0000
Subject: 2.11.6


---

diff --git a/.cvsignore b/.cvsignore
index 7796e9d..4327cc2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 control-center-2.10.1.tar.bz2
 control-center-2.11.5.tar.bz2
+control-center-2.11.6.tar.bz2
diff --git a/control-center.spec b/control-center.spec
index babf892..2bbe23b 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -13,7 +13,7 @@ ExcludeArch: ppc64
 %define libbonoboui_version 2.3.0
 %define gnome_vfs2_version 2.3.0
 %define desktop_file_utils_version 0.9
-%define xft_version 2.0.0
+%define xft_version 2.1.7
 %define fontconfig_version 1.0.0
 %define redhat_menus_version 1.8
 %define metacity_version 2.5.3
@@ -33,6 +33,8 @@ Patch2: control-center-2.11.5-fedora-apps.patch
 Patch3: control-center-2.9.4-filesel.patch
 Patch4: control-center-2.10.1-mark-tool-buttons-important.patch
 Patch5: control-center-2.11.5-acme-dummy.patch
+# patch out the xft 2.1.7 requirement until we ship modular xorg
+Patch6: control-center-2.11.6-xft.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -94,6 +96,7 @@ If you install GNOME, you need to install control-center.
 %patch3 -p1 -b .filesel
 %patch4 -p1 -b .mark-tool-buttons-important
 %patch5 -p1 -b .acme-dummy
+%patch6 -p1 -b .xft
 
 %build
 
diff --git a/sources b/sources
index e30e41c..dfdd81d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e6f3a42b2ccf1cf57fa8a49841e919c  control-center-2.11.5.tar.bz2
+adf6804249cff2e4d2ed1b3e87035c3d  control-center-2.11.6.tar.bz2