rpms/synaptic/F-7 synaptic.spec,1.21,1.22

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/synaptic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24311/synaptic/F-7

Modified Files:
	synaptic.spec 
Log Message:
Autodetect pam_stack module at build time.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/F-7/synaptic.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- synaptic.spec	24 Nov 2006 11:03:46 -0000	1.21
+++ synaptic.spec	3 Jun 2007 08:53:53 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 5.2%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: Applications/System
@@ -16,7 +16,7 @@
 Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch
 Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch
 URL: http://www.nongnu.org/synaptic/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: usermode-gtk
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -64,12 +64,17 @@
 #%PAM-1.0
 auth       sufficient   /%{_lib}/security/pam_rootok.so
 auth       sufficient   /%{_lib}/security/pam_timestamp.so
-auth       required     /%{_lib}/security/pam_stack.so service=system-auth
+auth       include      system-auth
 session    required     /%{_lib}/security/pam_permit.so
 session    optional     /%{_lib}/security/pam_xauth.so
 session    optional     /%{_lib}/security/pam_timestamp.so
 account    required     /%{_lib}/security/pam_permit.so
 EOF
+if -f /%{_lib}/security/pam_stack.so \
+   -a ! grep "Deprecated pam_stack module" /%{_lib}/security/pam_stack.so \
+      2>&1 > /dev/null; then
+  perl -pi -e's,include(\s*)(.*),required\1pam_stack.so service=\2,' $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/synaptic
+fi
 
 # Remove the default menu entries and install our own
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*
@@ -106,6 +111,9 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.57.2-6
+- Autodetect pam_stack module at build time.
+
 * Thu May 25 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
 - Enable 64-bit builds again (#193075 by Deji Akingunola).