RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   27-Jul-2007 17:21:03
  Branch: rpm-4_5                          Handle: 2007072716210300

  Modified files:           (Branch: rpm-4_5)
    rpm                     devtool devtool.conf

  Log:
    sync devtool %checkout with HEAD

  Summary:
    Revision    Changes     Path
    2.4.2.3     +10 -6      rpm/devtool
    2.7.2.3     +11 -10     rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool
  ============================================================================
  $ cvs diff -u -r2.4.2.2 -r2.4.2.3 devtool
  --- rpm/devtool	16 Jun 2007 18:14:06 -0000	2.4.2.2
  +++ rpm/devtool	27 Jul 2007 15:21:03 -0000	2.4.2.3
  @@ -4,8 +4,12 @@
   ##  Copyright (c) 2001 Ralf S. Engelschall <rse@engelschall.com>
   ##
   
  +#   determine source tree location
  +DEVTOOL_SRCDIR=`echo "$0" | sed -e 's;/devtool$;;'`
  +export DEVTOOL_SRCDIR
  +
   #   build environment sanity check
  -if [ ! -f devtool.conf ]; then
  +if [ ! -f ${DEVTOOL_SRCDIR}/devtool.conf ]; then
       echo "devtool:ERROR: no devtool.conf in current directory" 1>&2
       exit 1
   fi
  @@ -17,7 +21,7 @@
   fi
   cmd="$1"
   shift
  -cmdline=`grep "^%$cmd" devtool.conf`
  +cmdline=`grep "^%$cmd" ${DEVTOOL_SRCDIR}/devtool.conf`
   if [ ".$cmdline" = . ]; then
       echo "devtool:ERROR: command $cmd not found in devtool.conf" 1>&2
       exit 1
  @@ -36,9 +40,9 @@
   #   generate run-command script
   rm -f $tmpfile
   touch $tmpfile
  -( sed <"$0" -e '1,/^##  devtool.func {/d' -e '/^##  } devtool.func/,$d'
  -  sed <devtool.conf -e "1,/^%common/d" -e '/^%.*/,$d'
  -  sed <devtool.conf -e "1,/^%$cmd/d" -e '/^%.*/,$d' ) |\
  +( sed <${DEVTOOL_SRCDIR}/devtool -e '1,/^##  devtool.func {/d' -e '/^##  } devtool.func/,$d'
  +  sed <${DEVTOOL_SRCDIR}/devtool.conf -e "1,/^%common/d" -e '/^%.*/,$d'
  +  sed <${DEVTOOL_SRCDIR}/devtool.conf -e "1,/^%$cmd/d" -e '/^%.*/,$d' ) |\
   sed -e 's;\([ 	]\)@\([a-zA-Z_][a-zA-Z0-9_-]*\);\1devtool_\2;' \
       -e 's;\([ 	]\)%\([a-zA-Z_][a-zA-Z0-9_-]*\);\1devtool_devtool \2;' \
   >>$tmpfile
  @@ -54,7 +58,7 @@
   ##  devtool.func { # is now embedded. This line used as cutting point. Do not remove.
   
   devtool_devtool () {
  -    sh ./devtool "$@"
  +    sh ${DEVTOOL_SRCDIR}/devtool "$@"
   }
   
   devtool_require () {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.7.2.2 -r2.7.2.3 devtool.conf
  --- rpm/devtool.conf	16 Jun 2007 18:14:06 -0000	2.7.2.2
  +++ rpm/devtool.conf	27 Jul 2007 15:21:03 -0000	2.7.2.3
  @@ -3,30 +3,31 @@
   ##
   
   %common
  -    MODULE_NAMES="db lua zlib"
  -    MODULE_TAG_DB=""
  -    MODULE_TAG_LUA=""
  -    MODULE_TAG_ZLIB=""
  +    MODULE_NAMES="db file lua zlib"
  +    MODULE_TAG_DB="rpm-4_5"
  +    MODULE_TAG_FILE="rpm-4_5"
  +    MODULE_TAG_LUA="rpm-4_5"
  +    MODULE_TAG_ZLIB="rpm-4_5"
   
   %checkout
       for name in $MODULE_NAMES; do
           release=MODULE_TAG_`echo ${name} | tr [a-z] [A-Z]`
           release=`eval echo \\$${release}`
           if [ ".${release}" = . ]; then
  -            if [ -d ${name}/CVS ]; then
  +            if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
                   echo "===> ${name} (cvs up HEAD)"
  -                ( cd ${name} && cvs up -A )
  +                ( cd ${DEVTOOL_SRCDIR}/${name} && cvs -q up -A -P -d )
               else
                   echo "===> ${name} (cvs co HEAD)"
  -                cvs co -A -d ${name} ${name}
  +                ( cd ${DEVTOOL_SRCDIR} && cvs co -A -d ${name} ${name} )
               fi
           else
  -            if [ -d ${name}/CVS ]; then
  +            if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
                   echo "===> ${name} (cvs up ${release})"
  -                ( cd ${name} && cvs up -r${release} )
  +                ( cd ${DEVTOOL_SRCDIR}/${name} && cvs -q up -P -d -r${release} )
               else
                   echo "===> ${name} (cvs co ${release})"
  -                cvs co -r${release} -d ${name} ${name}
  +                ( cd ${DEVTOOL_SRCDIR} && cvs co -r${release} -d ${name} ${name} )
               fi
           fi
           echo "<=== ${name}"
  @@ .