SPECS: sudo.spec - keep custom install-sh - use pretty __make install

[sls]

Author: sls                          Date: Wed Oct 15 12:45:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- keep custom install-sh
- use pretty __make install

---- Files affected:
SPECS:
   sudo.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: SPECS/sudo.spec
diff -u SPECS/sudo.spec:1.132 SPECS/sudo.spec:1.133
--- SPECS/sudo.spec:1.132	Wed Oct 15 13:21:07 2008
+++ SPECS/sudo.spec	Wed Oct 15 14:45:18 2008
@@ -122,7 +122,9 @@
 %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}
@@ -150,23 +152,14 @@
 
 %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
@@ -205,6 +198,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2008/10/15 12:45:18  sls
+- keep custom install-sh
+- use pretty __make install
+
 Revision 1.132  2008/10/15 11:21:07  sls
 - parallel build works
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/sudo.spec?r1=1.132&r2=1.133&f=u