[mate-conf/f17] tighten subpkgs deps (%{__isa})

[Wolfgang Ulbrich]

commit 7e2a74cee803d93f1bdf13af9d59c7df474bbc95
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Aug 7 00:34:53 2012 +0200

    tighten subpkgs deps (%{__isa})
    
    - -devel: drop needless pkgconfig-related deps (they're autodetected)
    - sort BR's
    - omit needless Conflicts: mate-conf-dbus
    - don't own /var/lib/rpm-state
    - drop Group: tags
    - %files: track abi/abi items closer

 .gitignore             |    1 +
 mate-conf-1.4.0.tar.xz |  Bin 959816 -> 0 bytes
 mate-conf.spec         |   62 ++++++++++++++++++++++++------------------------
 3 files changed, 32 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c831804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/mate-conf-1.4.0.tar.xz
diff --git a/mate-conf.spec b/mate-conf.spec
index 6b8625e..3b294a3 100644
--- a/mate-conf.spec
+++ b/mate-conf.spec
@@ -6,9 +6,8 @@
 Summary:	A process-transparent configuration system
 Name:		mate-conf
 Version:	1.4.0
-Release:	11%{?dist}
+Release:	14%{?dist}
 License:	LGPLv2+ and GPLv2+
-Group:		System Environment/Base
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
@@ -18,23 +17,23 @@ Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 # Remove schemas on package removal (not upgrade).
 Source1:	macros.mateconf
 
+BuildRequires: dbus-glib-devel >= 0.8
+BuildRequires: gettext
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gobject-introspection-devel >= 0.9.5
+BuildRequires: gtk2-devel
+BuildRequires: gtk-doc >= 1.0
+BuildRequires: intltool
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
+BuildRequires: mate-common
 BuildRequires: mate-corba-devel >= %{mate_corba_version}
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk-doc >= 1.0
 BuildRequires: openldap-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: gtk2-devel
+
 Requires: dbus
 # for patch0
 Requires: /usr/bin/killall
-Conflicts: mate-conf-dbus
 
 Patch0: %{name}-1.4.0-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
@@ -46,15 +45,9 @@ support work group administration.
 
 %package devel
 Summary: Headers and libraries for mate-conf development
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# this one maybe could be dropped too, but not sure yet -- rex
 Requires: libxml2-devel
-Requires: mate-conf-devel >= %{mate_corba_version}
-Requires: glib2-devel >= %{glib2_version}
-# we install a pc file
-Requires: pkgconfig
-# we install an automake macro
-Requires: automake
 
 %description devel
 mate-conf development package. Contains files needed for doing
@@ -62,8 +55,7 @@ development using mate-conf.
 
 %package gtk
 Summary: Graphical mate-conf utilities
-Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk
 The mate-conf-gtk package contains graphical mate-conf utilities
@@ -104,6 +96,7 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 
 %find_lang %{name}
 
+
 %post
 /sbin/ldconfig
 
@@ -128,11 +121,11 @@ fi
 %{_bindir}/mateconf-merge-tree
 %{_bindir}/mateconftool-2
 %{_libexecdir}/mateconfd-2
-%{_libdir}/*.so.*
+%{_libdir}/libmateconf-2.so.4*
 %{_libdir}/MateConf/2/*.so
 %dir %{_datadir}/sgml
-%{_datadir}/sgml/mateconf
-%{_datadir}/MateConf
+%{_datadir}/sgml/mateconf/
+%{_datadir}/MateConf/
 %{_mandir}/man1/*
 %dir %{_libdir}/MateConf
 %dir %{_libdir}/MateConf/2
@@ -141,7 +134,6 @@ fi
 %{_datadir}/polkit-1/actions/org.mate.mateconf.defaults.policy
 %{_datadir}/dbus-1/system-services/org.mate.MateConf.Defaults.service
 %{_datadir}/dbus-1/services/org.mate.MateConf.service
-%dir %{_localstatedir}/lib/rpm-state/
 %{_localstatedir}/lib/rpm-state/mateconf/
 %{_libdir}/girepository-1.0
 %config(noreplace) %{_sysconfdir}/rpm/macros.mateconf
@@ -150,20 +142,28 @@ fi
 %{_bindir}/mateconf-gsettings-schema-convert
 %{_libdir}/gio/modules/libgsettingsmateconfbackend.so
 
-
 %files gtk
 %doc COPYING NEWS README
 %{_libexecdir}/mateconf-sanity-check-2
 
 %files devel
-%{_libdir}/*.so
-%{_includedir}/mateconf
-%{_datadir}/aclocal/*.m4
+%{_libdir}/libmateconf-2.so
+%{_includedir}/mateconf/
+%{_datadir}/aclocal/mateconf-2.m4
 %{_datadir}/gtk-doc/html/mateconf
-%{_libdir}/pkgconfig/*
-%{_datadir}/gir-1.0
+%{_libdir}/pkgconfig/mateconf-2.0.pc
+%{_datadir}/gir-1.0/
 
 %changelog
+* Mon Aug 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4.0-14
+- tighten subpkgs deps (%{__isa})
+- -devel: drop needless pkgconfig-related deps (they're autodetected)
+- sort BR's
+- omit needless Conflicts: mate-conf-dbus
+- don't own /var/lib/rpm-state
+- drop Group: tags
+- %files: track abi/abi items closer
+
 * 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