[mate-keyring] Fix directory ownership

[leigh123linux]

commit ed7be46e5fdc5fde3f5f03f5aa794d679185cbe6
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 23 10:30:27 2012 +0100

    Fix directory ownership

 mate-keyring.spec |   80 +++++++++++++++++++++++++++++------------------------
 1 files changed, 44 insertions(+), 36 deletions(-)
---
diff --git a/mate-keyring.spec b/mate-keyring.spec
index a3846a7..93e6f8b 100644
--- a/mate-keyring.spec
+++ b/mate-keyring.spec
@@ -1,23 +1,26 @@
 Summary:	Framework for managing passwords and other secrets
 Name:		mate-keyring
 Version:	1.4.0
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2+ and LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
-BuildRequires:	gtk2-devel mate-conf mate-conf-devel mate-desktop-devel mate-doc-utils lcov desktop-file-utils
-BuildRequires:	dbus-glib-devel
-BuildRequires:	libgcrypt-devel
-BuildRequires:	libtasn1-devel
-BuildRequires:	libtasn1-tools
-BuildRequires:	libmatekeyring-devel
-BuildRequires:	pam-devel
-BuildRequires:	mate-common
-BuildRequires:	libselinux-devel
-BuildRequires:	libcap-devel
-BuildRequires:	valgrind-devel
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(mateconf-2.0)
+BuildRequires:  pkgconfig(mate-desktop-2.0)
+BuildRequires:  pkgconfig(mate-doc-utils)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(mate-keyring-1)
+BuildRequires:  pkgconfig(libselinux)
+BuildRequires:  pkgconfig(libtasn1)
+BuildRequires:  libtasn1-tools
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pam-devel
+BuildRequires:  mate-common
+BuildRequires:  libcap-devel
+
 Requires: libmatekeyring pam
 
 %description
@@ -31,7 +34,7 @@ License: LGPLv2+
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: glib2-devel
-Requires: libmatekeyring-devel pam
+Requires: libmatekeyring-devel
 
 %description devel
 The mate-keyring-devel package contains the libraries and
@@ -41,6 +44,7 @@ header files needed to develop applications that use mate-keyring.
 Summary: MATE Desktop pam module for unlocking keyrings
 License: LGPLv2+
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pam
 
 %description pam
 Shared library for MATE Desktop pam auth
@@ -51,7 +55,13 @@ Shared library for MATE Desktop pam auth
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure --disable-static --disable-schemas-compile --with-gtk=2.0 --with-gnu-ld --enable-gcov --with-libgcrypt-prefix=%{_prefix} --with-pam-dir=%{_libdir}/security --with-root-certs=%{_sysconfdir}/ssl/certs --enable-valgrind
+%configure --disable-static \
+           --with-gtk=2.0 \
+           --enable-pam \
+           --with-pam-dir=/%{_lib}/security \
+
+# avoid unneeded direct dependencies
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make %{?_smp_mflags} V=1
 
@@ -59,11 +69,9 @@ make %{?_smp_mflags} V=1
 make DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.la' -exec rm -rf {} ';'
 find %{buildroot} -name '*.a' -exec rm -rf {} ';'
+
 %find_lang %{name}
 
-desktop-file-install										\
-		--dir=%{buildroot}%{_sysconfdir}/xdg/autostart					\
-%{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop
 
 %post -p /sbin/ldconfig
 
@@ -79,40 +87,40 @@ fi
 
 %files -f %{name}.lang
 %doc AUTHORS NEWS README COPYING COPYING.LIB
-%{_libdir}/lib*.so.*
-%dir %{_libdir}/mate-keyring
-%dir %{_libdir}/mate-keyring/devel
-%{_libdir}/mate-keyring/devel/*.so
-%{_libdir}/mate-keyring/standalone/gkm-secret-store-standalone.so
-%dir %{_libdir}/pkcs11
-%{_libdir}/pkcs11/*.so
 %{_bindir}/mate-keyring
-%{_libexecdir}/*
-%{_datadir}/dbus-1/services/*.service
-%{_datadir}/mategcr
-%{_datadir}/mate-keyring
+%{_bindir}/mate-keyring-daemon
 %{_sysconfdir}/xdg/autostart/mate-keyring-pkcs11.desktop
 %{_sysconfdir}/xdg/autostart/mate-keyring-secrets.desktop
 %{_sysconfdir}/xdg/autostart/mate-keyring-ssh.desktop
+%{_sysconfdir}/xdg/autostart/mate-keyring-gpg.desktop
+%{_libexecdir}/mate-keyring-prompt
+%{_libdir}/lib*.so.*
+%{_libdir}/mate-keyring/
+%{_libdir}/pkcs11/mate-keyring-pkcs11.so
+%{_datadir}/dbus-1/services/*.service
+%{_datadir}/mategcr/
+%{_datadir}/mate-keyring/
 %{_datadir}/MateConf/gsettings/*.convert
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_sysconfdir}/xdg/autostart/mate-keyring-gpg.desktop
-%{_bindir}/mate-keyring-daemon
 
 %files pam
-%{_libdir}/security/pam_mate_keyring.so
-
-
+/%{_lib}/security/pam_mate_keyring.so
 
 %files devel
+%{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/*
 %doc %{_datadir}/gtk-doc
 
-
-
 %changelog
+* Tue Oct 23 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-12
+- Fix directory ownership
+- remove desktop-file-utils build requires and validation on xdg files
+- remove surplus configure options
+- use correct directory for pam_mate_keyring.so
+- Drop un-needed build requires
+- re-add sed command to avoid unneeded direct dependencies
+
 * Mon Oct 22 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.0-11
 - Update BR