- release 2

[packages/sudo.git] / sudo.spec

diff --git a/sudo.spec b/sudo.spec
index 8040db520ba4a5fe1266465d39fdb64e94920698..330ef0475c498452a681b2c82833c5f4a21c9ca0 100644 (file)
--- a/sudo.spec
+++ b/sudo.spec
@@ -14,13 +14,13 @@ Summary(pt_BR.UTF-8):       Permite que usuários específicos executem comandos como
 Summary(ru.UTF-8):     Позволяет определенным пользователям исполнять команды от имени root
 Summary(uk.UTF-8):     Дозволяє вказаним користувачам виконувати команди від імені root
 Name:          sudo
-Version:       1.6.9p17
-Release:       1
+Version:       1.7.1
+Release:       2
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: 60daf18f28e2c1eb7641c4408e244110
+# Source0-md5: af672524b2c854a67612bf4c743f58b8
 Source1:       %{name}.pamd
 Source2:       %{name}-i.pamd
 Source3:       %{name}.logrotate
@@ -33,7 +33,7 @@ BuildRequires:        automake
 %{?with_kerberos5:BuildRequires:       krb5-devel}
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 %{?with_pam:BuildRequires:     pam-devel}
 %{?with_skey:BuildRequires:    skey-devel >= 2.2-11}
 Requires:      pam >= 0.99.7.1
@@ -121,7 +121,9 @@ rm -f acsite.m4
 %patch2 -p1
 
 %build
+%{__mv} install-sh install-custom-sh
 %{__libtoolize}
+%{__mv} install-custom-sh install-sh
 cp -f /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
@@ -145,27 +147,18 @@ cp -f /usr/share/automake/config.sub .
        --with%{!?with_selinux:out}-selinux \
        --with-long-otp-prompt
 
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man{5,8}}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man8}
 
-install sudo $RPM_BUILD_ROOT%{_bindir}
-ln $RPM_BUILD_ROOT%{_bindir}/{sudo,sudoedit}
-install visudo $RPM_BUILD_ROOT%{_sbindir}
-
-install sesh $RPM_BUILD_ROOT%{_libdir}
-
-install .libs/sudo_noexec.so $RPM_BUILD_ROOT%{_libdir}
-
-install sudoers $RPM_BUILD_ROOT%{_sysconfdir}
-
-install sudoers.man $RPM_BUILD_ROOT%{_mandir}/man5/sudoers.5
-install sudo.man $RPM_BUILD_ROOT%{_mandir}/man8/sudo.8
-install visudo.man $RPM_BUILD_ROOT%{_mandir}/man8/visudo.8
-ln $RPM_BUILD_ROOT%{_mandir}/man8/{sudo,sudoedit}.8
+%{__make} -j1 install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       install_uid=`id -u` \
+       install_gid=`id -g` \
+       sudoers_uid=`id -u` \
+       sudoers_gid=`id -g`
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i
@@ -176,12 +169,17 @@ chmod -R +r $RPM_BUILD_ROOT%{_prefix}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/sudo_noexec.la
 
+# replace hardlinks with symlinks
+ln -sf %{_bindir}/sudo $RPM_BUILD_ROOT%{_bindir}/sudoedit
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/sudoedit.8
+echo '.so sudo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/sudoedit.8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS CHANGES HISTORY README TROUBLESHOOTING sample.sudoers
+%doc HISTORY README TROUBLESHOOTING sample.sudoers
 %attr(440,root,root) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/sudoers
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo-i
@@ -190,8 +188,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/visudo
 %{?with_selinux:%attr(755,root,root) %{_libdir}/sesh}
 %attr(755,root,root) %{_libdir}/sudo_noexec.so
-%{_mandir}/man8/sudo.8*
 %{_mandir}/man5/sudoers.5*
+%{_mandir}/man8/sudo.8*
 %{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/visudo.8*
 %attr(600,root,root) %ghost /var/log/sudo