[mate-conf] Revert "update spec file requirements, remove gtk package"

[Rex Dieter]

commit 5fd0d00b59b59d850a06fb3003513c11edab6160
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 6 08:19:28 2012 -0500

    Revert "update spec file requirements, remove gtk package"
    
    This reverts commit 92d30736d588a839c98b232e877b5da19679a6a4.

 mate-conf.spec |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/mate-conf.spec b/mate-conf.spec
index 3fb1120..6b8625e 100644
--- a/mate-conf.spec
+++ b/mate-conf.spec
@@ -1,7 +1,12 @@
+%global mate_corba_version 1.1.0
+%global glib2_version 2.14.0
+%global dbus_version 1.0.0
+%global dbus_glib_version 0.74
+
 Summary:	A process-transparent configuration system
 Name:		mate-conf
 Version:	1.4.0
-Release:	12%{?dist}
+Release:	11%{?dist}
 License:	LGPLv2+ and GPLv2+
 Group:		System Environment/Base
 URL:		http://mate-desktop.org
@@ -15,18 +20,21 @@ Source1:	macros.mateconf
 
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
+BuildRequires: mate-corba-devel >= %{mate_corba_version}
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk-doc >= 1.0
 BuildRequires: openldap-devel
-BuildRequires: polkit-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: gobject-introspection-devel
+BuildRequires: intltool
+BuildRequires: polkit-devel >= 0.92
+BuildRequires: dbus-glib-devel >= 0.8
+BuildRequires: gobject-introspection-devel >= 0.9.5
+BuildRequires: libtool
 BuildRequires: mate-common
-BuildRequires: chrpath
-BuildRequires: mate-corba-devel
-BuildRequires: mate-doc-utils
-#Requires: dbus
+BuildRequires: gtk2-devel
+Requires: dbus
 # for patch0
-#Requires: /usr/bin/killall
-#Conflicts: mate-conf-dbus
+Requires: /usr/bin/killall
+Conflicts: mate-conf-dbus
 
 Patch0: %{name}-1.4.0-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
@@ -67,7 +75,14 @@ which require GTK+.
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure
+%configure \
+	--disable-static \
+	--with-openldap \
+	--enable-defaults-service \
+	--enable-gtk \
+	--enable-gsettings-backend=yes \
+	--enable-introspection \
+	--enable-gtk-doc
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -129,11 +144,15 @@ fi
 %dir %{_localstatedir}/lib/rpm-state/
 %{_localstatedir}/lib/rpm-state/mateconf/
 %{_libdir}/girepository-1.0
-%config(noreplace) %{_sysconfdir}macros.mateconf
+%config(noreplace) %{_sysconfdir}/rpm/macros.mateconf
 %config(noreplace) %{_sysconfdir}/xdg/autostart/mateconf-gsettings-data-convert.desktop
 %{_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
@@ -145,9 +164,6 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
-* Sun Aug 05 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.0-12
-- Fix build requirements and remmove gtk package
-
 * Tue Jul 31 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-11
 - remove %%defattr(-, root, root)
 - remove rm -rf $RPM_BUILD_ROOT from install section