OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Oct-2007 20:45:08
Branch: HEAD Handle: 2007102519450600
Modified files:
openpkg-src/op op.spec
Log:
follow advice of cs@ and always let GNU shtool determine path to the
tools and just dispatch for the options according to platform
Summary:
Revision Changes Path
1.2 +7 -16 openpkg-src/op/op.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/op/op.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 op.spec
--- openpkg-src/op/op.spec 25 Oct 2007 17:04:04 -0000 1.1
+++ openpkg-src/op/op.spec 25 Oct 2007 18:45:06 -0000 1.2
@@ -78,26 +78,17 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ l_su="`%{l_shtool} path su`"
+ l_shutdown="`%{l_shtool} path shutdown`"
+ l_reboot="`%{l_shtool} path shutdown`"
case "%{l_platform -t}" in
- *-freebsd* )
- l_su="/bin/su"
- l_shutdown="/usr/bin/shutdown -h now"
- l_reboot="/usr/bin/shutdown -r now"
- ;;
- *-linux* )
- l_su="/bin/su"
- l_shutdown="/bin/shutdown -h now"
- l_reboot="/bin/shutdown -r now"
- ;;
*-sunos* )
- l_su="/usr/bin/su"
- l_shutdown="/usr/bin/shutdown -i0 -g0 -y"
- l_reboot="/usr/bin/shutdown -i6 -g0 -y"
+ l_shutdown="$l_shutdown -i0 -g0 -y"
+ l_reboot="$l_reboot -i6 -g0 -y"
;;
* )
- l_su="`%{l_shtool} path su`"
- l_shutdown="`%{l_shtool} path shutdown` -h now"
- l_reboot="`%{l_shtool} path shutdown` -r now"
+ l_shutdown="$l_shutdown -r now"
+ l_reboot="$l_reboot -r now"
;;
esac
%{l_shtool} mkdir -f -p -m 755 \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
