Poifect! Thanks.

On May 25, 2008, at 4:37 AM, Ralf S. Engelschall wrote:

>   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: xar rpm file zlib                Date:   25-May-2008  
> 10:37:11
>   Branch: HEAD                             Handle: 2008052508371001
>
>   Modified files:
>     file                    autogen.sh
>     rpm                     autogen.sh
>     xar                     autogen.sh
>     zlib                    autogen.sh
>
>   Log:
>     be smart and allow one to still build RPM from CVS with old GNU
>     libtool 1.5.x
>
>   Summary:
>     Revision    Changes     Path
>     1.39        +6  -1      file/autogen.sh
>     2.94        +6  -1      rpm/autogen.sh
>     1.13        +6  -1      xar/autogen.sh
>     1.17        +6  -1      zlib/autogen.sh
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: file/autogen.sh
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.38 -r1.39 autogen.sh
>   --- file/autogen.sh	24 May 2008 14:31:04 -0000	1.38
>   +++ file/autogen.sh	25 May 2008 08:37:10 -0000	1.39
>   @@ -17,6 +17,7 @@
>    #   wrapper for running GNU libtool's libtoolize(1)
>    libtoolize () {
>        _libtoolize=`which glibtoolize 2>/dev/null`
>   +    _libtoolize_args="$*"
>        case "$_libtoolize" in
>            /* ) ;;
>            *  ) _libtoolize=`which libtoolize 2>/dev/null`
>   @@ -26,7 +27,11 @@
>                 esac
>                 ;;
>        esac
>   -    $_libtoolize ${1+"$@"}
>   +    _libtoolize_version="`$_libtoolize --version | sed -e '1q' |  
> sed -e 's;^[^0-9];;'`"
>   +    case "$_libtoolize_version" in
>   +        1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed - 
> e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
>   +    esac
>   +    eval $_libtoolize $_libtoolize_args
>    }
>
>    #   requirements sanity check
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/autogen.sh
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.93 -r2.94 autogen.sh
>   --- rpm/autogen.sh	24 May 2008 14:31:03 -0000	2.93
>   +++ rpm/autogen.sh	25 May 2008 08:37:10 -0000	2.94
>   @@ -17,6 +17,7 @@
>    #   wrapper for running GNU libtool's libtoolize(1)
>    libtoolize () {
>        _libtoolize=`which glibtoolize 2>/dev/null`
>   +    _libtoolize_args="$*"
>        case "$_libtoolize" in
>            /* ) ;;
>            *  ) _libtoolize=`which libtoolize 2>/dev/null`
>   @@ -26,7 +27,11 @@
>                 esac
>                 ;;
>        esac
>   -    $_libtoolize ${1+"$@"}
>   +    _libtoolize_version="`$_libtoolize --version | sed -e '1q' |  
> sed -e 's;^[^0-9];;'`"
>   +    case "$_libtoolize_version" in
>   +        1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed - 
> e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
>   +    esac
>   +    eval $_libtoolize $_libtoolize_args
>    }
>
>    #   requirements sanity check
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: xar/autogen.sh
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.12 -r1.13 autogen.sh
>   --- xar/autogen.sh	24 May 2008 14:31:05 -0000	1.12
>   +++ xar/autogen.sh	25 May 2008 08:37:11 -0000	1.13
>   @@ -17,6 +17,7 @@
>    #   wrapper for running GNU libtool's libtoolize(1)
>    libtoolize () {
>        _libtoolize=`which glibtoolize 2>/dev/null`
>   +    _libtoolize_args="$*"
>        case "$_libtoolize" in
>            /* ) ;;
>            *  ) _libtoolize=`which libtoolize 2>/dev/null`
>   @@ -26,7 +27,11 @@
>                 esac
>                 ;;
>        esac
>   -    $_libtoolize ${1+"$@"}
>   +    _libtoolize_version="`$_libtoolize --version | sed -e '1q' |  
> sed -e 's;^[^0-9];;'`"
>   +    case "$_libtoolize_version" in
>   +        1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed - 
> e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
>   +    esac
>   +    eval $_libtoolize $_libtoolize_args
>    }
>
>    #   requirements sanity check
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: zlib/autogen.sh
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.16 -r1.17 autogen.sh
>   --- zlib/autogen.sh	24 May 2008 14:31:05 -0000	1.16
>   +++ zlib/autogen.sh	25 May 2008 08:37:11 -0000	1.17
>   @@ -17,6 +17,7 @@
>    #   wrapper for running GNU libtool's libtoolize(1)
>    libtoolize () {
>        _libtoolize=`which glibtoolize 2>/dev/null`
>   +    _libtoolize_args="$*"
>        case "$_libtoolize" in
>            /* ) ;;
>            *  ) _libtoolize=`which libtoolize 2>/dev/null`
>   @@ -26,7 +27,11 @@
>                 esac
>                 ;;
>        esac
>   -    $_libtoolize ${1+"$@"}
>   +    _libtoolize_version="`$_libtoolize --version | sed -e '1q' |  
> sed -e 's;^[^0-9];;'`"
>   +    case "$_libtoolize_version" in
>   +        1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed - 
> e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
>   +    esac
>   +    eval $_libtoolize $_libtoolize_args
>    }
>
>    #   requirements sanity check
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org