head 1.2; access; symbols; locks; strict; comment @# @; 1.2 date 2008.12.21.08.33.07; author rse; state Exp; branches; next 1.1; commitid mEGcuLYhTtU4jjvt; 1.1 date 2008.12.19.09.33.20; author rse; state Exp; branches; next ; commitid 477JomovoskJH3vt; desc @@ 1.2 log @upgrading package: yml 1.6.2 -> 1.6.3 @ text @Index: yml --- yml.orig 2008-12-20 19:24:24 +0100 +++ yml 2008-12-21 09:25:29 +0100 @@@@ -1,14 +1,15 @@@@ #!/bin/sh -mydir=`dirname "$0"` - +PYTHONPATH=@@l_prefix@@/lib/yml +export PYTHONPATH + if [ "$1". = -f. -o "$1". = --fo. ] ; then fo=1 shift fi if test -z $fo ; then - python "$mydir/yml2pyml.py" "$1" | python + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py "$1" | @@l_prefix@@/bin/python else - python "$mydir/yml2pyml.py" "$1" | python | xmlstarlet fo + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py "$1" | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xmlstarlet fo fi Index: ysltproc --- ysltproc.orig 2008-12-20 19:38:45 +0100 +++ ysltproc 2008-12-21 09:28:23 +0100 @@@@ -1,25 +1,24 @@@@ #!/bin/sh -mydir=`dirname "$0"` +PYTHONPATH=@@l_prefix@@/lib/yml +export PYTHONPATH function _mktemp() { - _temp="/tmp/`hexdump -n 16 -e '"%x"' /dev/urandom`.tmp" - touch $_temp - echo $_temp + @@l_prefix@@/bin/mktemp } if test -z `echo "$2" | grep -v '\.x'` ; then if test -z "$2" ; then tempfile=`_mktemp` echo '' > $tempfile - python "$mydir/yml2pyml.py" "$1" | python | xsltproc - $tempfile + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py "$1" | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xsltproc - $tempfile rm -f $tempfile else - python "$mydir/yml2pyml.py" "$1" | python | xsltproc - "$2" + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py "$1" | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xsltproc - "$2" fi else tempfile=`_mktemp` - python "$mydir/yml2pyml.py" "$2" | python > $tempfile - python "$mydir/yml2pyml.py" "$1" | python | xsltproc - $tempfile + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py "$2" | @@l_prefix@@/bin/python > $tempfile + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py "$1" | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xsltproc - $tempfile rm -f $tempfile fi @ 1.1 log @modifying package: yml-1.6.2 20081206 -> 20081219 @ text @d2 3 a4 3 --- yml.orig 2008-11-19 19:05:13 +0100 +++ yml 2008-12-19 10:29:15 +0100 @@@@ -1,7 +1,10 @@@@ d7 2 a8 2 -export YML_PATH=.:$PATH -mydir=`dirname $0` d11 2 a12 5 + +YML_PATH=@@l_prefix@@/lib/yml:. +export YML_PATH if [ $1. = -f. -o $1. = --fo. ] ; then d14 1 a14 1 @@@@ -11,8 +14,8 @@@@ d18 2 a19 2 - python $mydir/yml2pyml.py $1 | python + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py $1 | @@l_prefix@@/bin/python d21 2 a22 2 - python $mydir/yml2pyml.py $1 | python | xmlstarlet fo + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py $1 | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xmlstarlet fo a23 1 d25 3 a27 3 --- ysltproc.orig 2008-11-19 19:06:08 +0100 +++ ysltproc 2008-12-19 10:30:35 +0100 @@@@ -1,21 +1,24 @@@@ d30 1 a30 2 -export YML_PATH=.:$PATH -mydir=`dirname $0` a32 3 + +YML_PATH=@@l_prefix@@/lib/yml:. +export YML_PATH d34 10 a43 4 if test -z `echo $2 | grep -v '\.x'` ; then if test -z $2 ; then - tempfile=`mktemp` + tempfile=`@@l_prefix@@/bin/mktemp` d45 2 a46 2 - python $mydir/yml2pyml.py $1 | python | xsltproc - $tempfile + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py $1 | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xsltproc - $tempfile d49 2 a50 2 - python $mydir/yml2pyml.py $1 | python | xsltproc - $2 + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py $1 | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xsltproc - $2 d53 5 a57 6 - tempfile=`mktemp` - python $mydir/yml2pyml.py $2 | python > $tempfile - python $mydir/yml2pyml.py $1 | python | xsltproc - $tempfile + tempfile=`@@l_prefix@@/bin/mktemp` + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py $2 | @@l_prefix@@/bin/python > $tempfile + @@l_prefix@@/bin/python @@l_prefix@@/lib/yml/yml2pyml.py $1 | @@l_prefix@@/bin/python | @@l_prefix@@/bin/xsltproc - $tempfile a59 1 @