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: 19-Dec-2008 10:33:21 Branch: HEAD Handle: 2008121909332000 Added files: openpkg-src/yml yml.patch Modified files: openpkg-src/yml yml.spec Log: modifying package: yml-1.6.2 20081206 -> 20081219 Summary: Revision Changes Path 1.1 +63 -0 openpkg-src/yml/yml.patch 1.13 +4 -7 openpkg-src/yml/yml.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/yml/yml.patch ============================================================================ $ cvs diff -u -r0 -r1.1 yml.patch --- /dev/null 2008-12-19 10:33:00 +0100 +++ yml.patch 2008-12-19 10:33:21 +0100 @@ -0,0 +1,63 @@ +Index: yml +--- yml.orig 2008-11-19 19:05:13 +0100 ++++ yml 2008-12-19 10:29:15 +0100 +@@ -1,7 +1,10 @@ + #!/bin/sh + +-export YML_PATH=.:$PATH +-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 + fo=1 +@@ -11,8 +14,8 @@ + 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-11-19 19:06:08 +0100 ++++ ysltproc 2008-12-19 10:30:35 +0100 +@@ -1,21 +1,24 @@ + #!/bin/sh + +-export YML_PATH=.:$PATH +-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` + 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 + 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 ++ 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 + rm -f $tempfile + fi + @@ . patch -p0 <<'@@ .' Index: openpkg-src/yml/yml.spec ============================================================================ $ cvs diff -u -r1.12 -r1.13 yml.spec --- openpkg-src/yml/yml.spec 6 Dec 2008 18:33:30 -0000 1.12 +++ openpkg-src/yml/yml.spec 19 Dec 2008 09:33:20 -0000 1.13 @@ -32,10 +32,11 @@ Group: XML License: GPL Version: 1.6.2 -Release: 20081206 +Release: 20081219 # list of sources Source0: http://fdik.org/yml/yml-%{version}.tar.bz2 +Patch0: yml.patch # build information Prefix: %{l_prefix} @@ -61,6 +62,7 @@ %prep %setup -q -c + %patch -p0 %build @@ -69,12 +71,7 @@ %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/lib/yml - %{l_shtool} install -c -m 755 \ - -e 's;/var/www/www.fdik.org/yml;%{l_prefix}/lib/yml;g' \ - -e 's;python;%{l_prefix}/bin/python;g' \ - -e 's;xmlstarlet;%{l_prefix}/bin/xmlstarlet;g' \ - -e 's;xsltproc;%{l_prefix}/bin/xsltproc;g' \ - -e 's;mktemp;%{l_prefix}/bin/mktemp;g' \ + %{l_shtool} install -c -m 755 %{l_value -s -a} \ yml ysltproc $RPM_BUILD_ROOT%{l_prefix}/bin/ %{l_shtool} install -c -m 644 \ *.py *.yml *.ysl $RPM_BUILD_ROOT%{l_prefix}/lib/yml/ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
