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: 21-Dec-2008 09:33:10 Branch: HEAD Handle: 2008122108330701 Modified files: openpkg-src/yml yml.patch yml.spec Log: upgrading package: yml 1.6.2 -> 1.6.3 Summary: Revision Changes Path 1.2 +35 -39 openpkg-src/yml/yml.patch 1.14 +2 -2 openpkg-src/yml/yml.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/yml/yml.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 yml.patch --- openpkg-src/yml/yml.patch 19 Dec 2008 09:33:20 -0000 1.1 +++ openpkg-src/yml/yml.patch 21 Dec 2008 08:33:07 -0000 1.2 @@ -1,63 +1,59 @@ Index: yml ---- yml.orig 2008-11-19 19:05:13 +0100 -+++ yml 2008-12-19 10:29:15 +0100 -@@ -1,7 +1,10 @@ +--- yml.orig 2008-12-20 19:24:24 +0100 ++++ yml 2008-12-21 09:25:29 +0100 +@@ -1,14 +1,15 @@ #!/bin/sh --export YML_PATH=.:$PATH --mydir=`dirname $0` +-mydir=`dirname "$0"` +- +pythonpa...@l_prefix@/lib/yml +export PYTHONPATH -+ -+yml_pa...@l_prefix@/lib/yml:. -+export YML_PATH - - if [ $1. = -f. -o $1. = --fo. ] ; then ++ + if [ "$1". = -f. -o "$1". = --fo. ] ; then fo=1 -@@ -11,8 +14,8 @@ + 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 +- 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 +- 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-11-19 19:06:08 +0100 -+++ ysltproc 2008-12-19 10:30:35 +0100 -@@ -1,21 +1,24 @@ +--- ysltproc.orig 2008-12-20 19:38:45 +0100 ++++ ysltproc 2008-12-21 09:28:23 +0100 +@@ -1,25 +1,24 @@ #!/bin/sh --export YML_PATH=.:$PATH --mydir=`dirname $0` +-mydir=`dirname "$0"` +pythonpa...@l_prefix@/lib/yml +export PYTHONPATH -+ -+yml_pa...@l_prefix@/lib/yml:. -+export YML_PATH - if test -z `echo $2 | grep -v '\.x'` ; then - if test -z $2 ; then -- tempfile=`mktemp` -+ tempfil...@l_prefix@/bin/mktemp` + 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 '<empty/>' > $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 +- 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 +- 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 -+ tempfil...@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 + 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 - @@ . patch -p0 <<'@@ .' Index: openpkg-src/yml/yml.spec ============================================================================ $ cvs diff -u -r1.13 -r1.14 yml.spec --- openpkg-src/yml/yml.spec 19 Dec 2008 09:33:20 -0000 1.13 +++ openpkg-src/yml/yml.spec 21 Dec 2008 08:33:08 -0000 1.14 @@ -31,8 +31,8 @@ Class: EVAL Group: XML License: GPL -Version: 1.6.2 -Release: 20081219 +Version: 1.6.3 +Release: 20081221 # list of sources Source0: http://fdik.org/yml/yml-%{version}.tar.bz2 @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
