packages: sudo/sudo.spec - ac deps, fix without ldap

glen glen at pld-linux.org
Mon Jun 7 13:43:31 CEST 2010


Author: glen                         Date: Mon Jun  7 11:43:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ac deps, fix without ldap

---- Files affected:
packages/sudo:
   sudo.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: packages/sudo/sudo.spec
diff -u packages/sudo/sudo.spec:1.155 packages/sudo/sudo.spec:1.156
--- packages/sudo/sudo.spec:1.155	Mon Jun  7 10:58:13 2010
+++ packages/sudo/sudo.spec	Mon Jun  7 13:43:26 2010
@@ -6,7 +6,13 @@
 %bcond_without	pam		# disable PAM support
 %bcond_without	selinux		# build without SELinux support
 %bcond_with	skey		# enable skey (onetime passwords) support (conflicts with PAM)
-#
+
+%if "%{pld_release}" == "ac"
+%define		pam_ver	0.80.1
+%else
+%define		pam_ver	0.99.7.1
+%endif
+
 Summary:	Allows command execution as root for specified users
 Summary(es.UTF-8):	Permite que usuarios específicos ejecuten comandos como se fueran el root
 Summary(ja.UTF-8):	指定ユーザに制限付のroot権限を許可する
@@ -36,8 +42,9 @@
 BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_pam:BuildRequires:	pam-devel}
+BuildRequires:	rpm >= 4.4.9-56
 %{?with_skey:BuildRequires:	skey-devel >= 2.2-11}
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= %{pam_ver}
 Obsoletes:	cu-sudo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -189,7 +196,7 @@
 %{?with_selinux:%attr(755,root,root) %{_libdir}/sesh}
 %attr(755,root,root) %{_libdir}/sudo_noexec.so
 %{_mandir}/man5/sudoers.5*
-%{_mandir}/man5/sudoers.ldap.5*
+%{?with_ldap:%{_mandir}/man5/sudoers.ldap.5*}
 %{_mandir}/man8/sudo.8*
 %{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/visudo.8*
@@ -203,6 +210,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2010/06/07 11:43:26  glen
+- ac deps, fix without ldap
+
 Revision 1.155  2010/06/07 08:58:13  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sudo/sudo.spec?r1=1.155&r2=1.156&f=u



More information about the pld-cvs-commit mailing list