[mate-conf/f17] merge with master

[Dan Mashal]

commit 24a1de9cc91e9f529b2ce998b377908244efbc2d
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Sep 2 01:34:39 2012 -0700

    merge with master

 mate-conf.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/mate-conf.spec b/mate-conf.spec
index d95436e..543dfaa 100644
--- a/mate-conf.spec
+++ b/mate-conf.spec
@@ -27,9 +27,6 @@ BuildRequires: intltool
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: mate-common
-BuildRequires: mate-corba-devel >= %{mate_corba_version}
-BuildRequires: openldap-devel
-BuildRequires: polkit-devel >= 0.92
 BuildRequires: mate-corba-devel
 BuildRequires: openldap-devel
 BuildRequires: polkit-devel
@@ -134,9 +131,6 @@ fi
 %{_bindir}/mateconf-gsettings-data-convert
 %{_bindir}/mateconf-gsettings-schema-convert
 %{_libdir}/gio/modules/libgsettingsmateconfbackend.so
-
-%files gtk
-%doc COPYING NEWS README
 %{_libexecdir}/mateconf-sanity-check-2
 
 %files devel