fix spec file

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5312 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mate-conf/mate-conf-vl.spec

@@ -74,6 +74,9 @@ This package contains documentation for mate-conf.
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/mateconf.xml.system
+
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
@@ -83,15 +86,26 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+if [ $1 -gt 1 ]; then
+	if ! fgrep -q mateconf.xml.system %{_sysconfdir}/mateconf/2/path; then
+		sed -i -e 's@xml:readwrite:$(HOME)/.mateconf@&\n\n# Location for system-wide settings.\nxml:readonly:/etc/mateconf/mateconf.xml.system@' %{_sysconfdir}/mateconf/2/path
+	fi
+fi
 
 %postun -p /sbin/ldconfig
 
 %files -f MateConf2.lang
 %defattr(-,root,root,-)
 %doc COPYING COPYING ChangeLog NEWS README
+%config %{_sysconfdir}/mateconf/2/path
+%dir %{_sysconfdir}/mateconf
+%dir %{_sysconfdir}/mateconf/2
+%dir %{_sysconfdir}/mateconf/mateconf.xml.defaults
+%dir %{_sysconfdir}/mateconf/mateconf.xml.mandatory
+%dir %{_sysconfdir}/mateconf/mateconf.xml.system
 %{_sysconfdir}/dbus-1/system.d/org.mate.MateConf.Defaults.conf
-%{_sysconfdir}/mateconf/*
 %{_bindir}/mateconf-merge-tree
 %{_bindir}/mateconftool-2
 %{_libdir}/libmateconf-2.so.*

m/mate-display-manager/mate-display-manager-vl.spec

@@ -93,7 +93,7 @@ if [ "$1" -gt 1 ]; then
     echo %{_sysconfdir}/mateconf/schemas/$S; done \
     | xargs mateconftool-2 --makefile-uninstall-rule >& /dev/null ||:
 fi
-/usr/sbin/useradd -M -u 43 -d %{_localstatedir}/mdm -s /sbin/nologin -r mdm > /dev/null 2>&1
+/usr/sbin/useradd -M -u 44 -d %{_localstatedir}/mdm -s /sbin/nologin -r mdm > /dev/null 2>&1
 /usr/sbin/usermod -d %{_localstatedir}/mdm -s /sbin/nologin mdm >/dev/null 2>&1
 
 %preun
@@ -138,7 +138,7 @@ fi
 %{_datadir}/pixmaps
 %attr(1770, mdm, mdm) %dir %{_localstatedir}/mdm
 %attr(1750, mdm, mdm) %dir %{_localstatedir}/mdm/.mateconf.mandatory
-%attr(1640, mdm, mdm) %dir %{_localstatedir}/mdm/.mateconf.mandatory/*.xml
+%attr(1640, mdm, mdm) %{_localstatedir}/mdm/.mateconf.mandatory/*.xml
 %attr(1640, mdm, mdm) %dir %{_localstatedir}/mdm/.mateconf.path
 
 

m/mate-keyring/mate-keyring-vl.spec

@@ -12,6 +12,7 @@ BuildRequires:	gtk2-devel
 BuildRequires:	libgcrypt-devel
 BuildRequires:	dbus-devel
 BuildRequires:	libtasn1-devel
+BuildRequires:	pam-devel
 BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -59,6 +60,7 @@ This package contains documentation for mate-keyring.
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
 %configure \
 	--libexecdir=%{_libexecdir}/mate \
+	--with-pam-dir=/%{_lib}/security \
 	--disable-static 
 
 %{__make} %{?_smp_mflags}
@@ -84,6 +86,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
+/%{_lib}/security/pam_mate_keyring.so
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_bindir}/mate-keyring
 %{_bindir}/mate-keyring-daemon