rpms/smart/F-7 smart.pam,1.1,1.2 smart.spec,1.20,1.21

[Axel Thimm (athimm)]

Author: athimm

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

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


Index: smart.pam
===================================================================
RCS file: /cvs/extras/rpms/smart/F-7/smart.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.pam	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.pam	3 Jun 2007 07:41:30 -0000	1.2
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
 auth       sufficient	pam_timestamp.so
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 session    required	pam_permit.so
 session    optional	pam_timestamp.so
 session    optional	pam_xauth.so


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/F-7/smart.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smart.spec	5 Feb 2007 01:05:34 -0000	1.20
+++ smart.spec	3 Jun 2007 07:41:30 -0000	1.21
@@ -1,4 +1,5 @@
-%define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+# This is not defined on Fedora buildsystems
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %bcond_without ksmarttray
 %bcond_without pygtk
@@ -6,7 +7,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.50
-Release: 45%{?dist}
+Release: 46%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -78,6 +79,14 @@
 %patch2 -p1
 # /usr/lib is hardcoded 
 perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py
+install -p -m 644 %{SOURCE2} .
+# Detect whether the system is using pam_stack
+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,' smart.pam
+  touch -r %{SOURCE2} smart.pam
+fi
 
 %build
 CFLAGS="%{optflags}"
@@ -119,7 +128,7 @@
 mkdir -p %{buildroot}/etc/security/console.apps
 mkdir -p %{buildroot}/etc/pam.d
 install -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/smart-root
-install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/smart-root
+install -p -m 644 smart.pam %{buildroot}/etc/pam.d/smart-root
 
 # smart-update
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
@@ -198,6 +207,9 @@
 %endif
 
 %changelog
+* Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-46
+- Autodetect pam_stack module at build time.
+
 * Mon Feb  5 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.50-45
 - Adjust checks for autotools.