From d610fe7c8e1d2b698bf25511e91be08be7b33978 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Tue, 12 Apr 2005 12:19:47 +0000
Subject: [PATCH] [tw] - new version 1.6.8p8: new sudoedit and sudo_noexec

---
 sudo.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sudo.spec b/sudo.spec
index e0de830..c09fb49 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -3,12 +3,12 @@
 %endif
 Summary: Allows restricted root access for specified users.
 Name: sudo
-Version: 1.6.7p5
-Release: 31
+Version: 1.6.8p8
+Release: 1
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
-Patch1: sudo-selinux.patch
+Patch1: sudo-1.6.8p8-selinux.patch
 URL: http://www.courtesan.com/sudo/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: /etc/pam.d/system-auth, vim-minimal
@@ -61,7 +61,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
-%{makeinstall} install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
+make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
 install -d -m 700 $RPM_BUILD_ROOT/var/run/sudo
 
@@ -85,12 +85,15 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/sudo
 %dir /var/run/sudo
 %attr(4111,root,root) %{_bindir}/sudo
+%attr(4111,root,root) %{_bindir}/sudoedit
 %attr(0755,root,root) %{_sbindir}/visudo
 %if %{WITH_SELINUX}
 %attr(0755,root,root) %{_sbindir}/sesh
 %endif
+%{_libexecdir}/sudo_noexec.*
 %{_mandir}/man5/sudoers.5*
 %{_mandir}/man8/sudo.8*
+%{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/visudo.8*
 
 # Make sure permissions are ok even if we're updating
@@ -98,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Mon Apr  4 2005 Thomas Woerner <twoerner@redhat.com> 1.6.8p8-1
+- new version 1.6.8p8: new sudoedit and sudo_noexec
+
 * Wed Feb  9 2005 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-31
 - rebuild