From e3e8515a4009a1da78f02728d0ae8b8860e4215f Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Feb 26 2007 19:23:08 +0000
Subject: fix some spec file issues


---

diff --git a/sudo.spec b/sudo.spec
index 4ddaf7f..919f161 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,13 +1,13 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.8p12
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
 Source0: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
 Source1: sudo-1.6.8p12-sudoers
-BuildRoot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /etc/pam.d/system-auth, vim-minimal
 
 BuildRequires: pam-devel
@@ -56,22 +56,23 @@ F_PIE=-fPIE
 F_PIE=-fpie
 %endif
 
-# Note: there is a problem rebuild the ./configure script (for pam-login patch), 
-#       so we use -DHAVE_PAM_LOGIN rather than --with-pam-login... 
-#       (it's workaround that should be fixed)
-export CFLAGS="$RPM_OPT_FLAGS $F_PIE -DHAVE_PAM_LOGIN" LDFLAGS="-pie" 
+# Note: there is a problem rebuild the ./configure script (for pam-login patch),
+# so we use -DHAVE_PAM_LOGIN rather than --with-pam-login...
+# (it's workaround that should be fixed)
+export CFLAGS="$RPM_OPT_FLAGS $F_PIE -DHAVE_PAM_LOGIN" LDFLAGS="-pie"
 
 %configure \
-	--prefix=%{_prefix} \
-	--sbindir=%{_sbindir} \
-	--with-logging=syslog \
-	--with-logfac=authpriv \
-	--with-pam \
-	--with-editor=/bin/vi \
-	--with-env-editor \
-	--with-ignore-dot \
-	--with-tty-tickets \
-	--with-ldap
+        --prefix=%{_prefix} \
+        --sbindir=%{_sbindir} \
+        --libdir=%{_libdir} \
+        --with-logging=syslog \
+        --with-logfac=authpriv \
+        --with-pam \
+        --with-editor=/bin/vi \
+        --with-env-editor \
+        --with-ignore-dot \
+        --with-tty-tickets \
+        --with-ldap
 make
 
 %install
@@ -79,26 +80,26 @@ rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 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
-install -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
+install -p -d -m 700 $RPM_BUILD_ROOT/var/run/sudo
+install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF
 #%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    optional	pam_keyinit.so revoke
-session    required	pam_limits.so
+auth       include      system-auth
+account    include      system-auth
+password   include      system-auth
+session    optional     pam_keyinit.so revoke
+session    required     pam_limits.so
 EOF
 
 cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF
 #%PAM-1.0
-auth       include	sudo
-account    include	sudo
-password   include	sudo
-session    optional	pam_keyinit.so force revoke
-session    required	pam_limits.so
+auth       include      sudo
+account    include      sudo
+password   include      sudo
+session    optional     pam_keyinit.so force revoke
+session    required     pam_limits.so
 EOF
 
 
@@ -126,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Mon Feb 26 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-13
+- fix some spec file issues
+
 * Thu Dec 14 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-12
 - fix rpmlint issue
 
@@ -392,8 +396,8 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Oct 08 1998 Michael Maher <mike@redhat.com>
 - built package for 5.2 
 
-* Mon May 18 1998 Michael Maher	<mike@redhat.com>
-- updated SPEC file. 
+* Mon May 18 1998 Michael Maher <mike@redhat.com>
+- updated SPEC file
 
 * Thu Jan 29 1998 Otto Hammersmith <otto@redhat.com>
 - updated to 1.5.4