OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   15-Jun-2005 16:01:41
  Branch: HEAD                             Handle: 2005061515010437

  Modified files:
    openpkg-src/al          al.spec
    openpkg-src/as-gui      as-gui.spec
    openpkg-src/cfg         cfg.spec
    openpkg-src/ettercap    ettercap.spec
    openpkg-src/ex          ex.spec
    openpkg-src/flow2rrd    flow2rrd.spec
    openpkg-src/fsl         fsl.spec
    openpkg-src/getopt      getopt.spec
    openpkg-src/iselect     iselect.spec
    openpkg-src/jitterbug   jitterbug.spec
    openpkg-src/l2          l2.spec
    openpkg-src/libnetdude  libnetdude.spec
    openpkg-src/libpcapnav  libpcapnav.spec
    openpkg-src/libradius   libradius.spec
    openpkg-src/lmtp2nntp   lmtp2nntp.spec
    openpkg-src/lzo         lzo.spec
    openpkg-src/lzop        lzop.spec
    openpkg-src/mm          mm.spec
    openpkg-src/netdude     netdude.spec
    openpkg-src/newt        newt.spec
    openpkg-src/nmap        nmap.spec
    openpkg-src/openldap    openldap.spec
    openpkg-src/openpkg-rc  openpkg-rc.spec
    openpkg-src/petidomo    petidomo.spec
    openpkg-src/php         php.spec
    openpkg-src/php5        php5.spec
    openpkg-src/pth         pth.spec
    openpkg-src/sa          sa.spec
    openpkg-src/shiela      shiela.spec
    openpkg-src/sio         sio.spec
    openpkg-src/snmpdx      snmpdx.spec
    openpkg-src/str         str.spec
    openpkg-src/svs         svs.spec
    openpkg-src/uuid        uuid.spec
    openpkg-src/val         val.spec
    openpkg-src/var         var.spec
    openpkg-src/wml         wml.spec
    openpkg-src/xds         xds.spec

  Log:
    SA-2005.011-shtool; CAN-2005-1751, CAN-2005-1759

  Summary:
    Revision    Changes     Path
    1.17        +4  -3      openpkg-src/al/al.spec
    1.64        +4  -3      openpkg-src/as-gui/as-gui.spec
    1.25        +4  -3      openpkg-src/cfg/cfg.spec
    1.10        +4  -3      openpkg-src/ettercap/ettercap.spec
    1.25        +4  -3      openpkg-src/ex/ex.spec
    1.12        +4  -3      openpkg-src/flow2rrd/flow2rrd.spec
    1.79        +4  -3      openpkg-src/fsl/fsl.spec
    1.10        +4  -3      openpkg-src/getopt/getopt.spec
    1.31        +4  -3      openpkg-src/iselect/iselect.spec
    1.41        +4  -3      openpkg-src/jitterbug/jitterbug.spec
    1.30        +4  -3      openpkg-src/l2/l2.spec
    1.14        +4  -3      openpkg-src/libnetdude/libnetdude.spec
    1.12        +4  -3      openpkg-src/libpcapnav/libpcapnav.spec
    1.7         +4  -3      openpkg-src/libradius/libradius.spec
    1.67        +4  -3      openpkg-src/lmtp2nntp/lmtp2nntp.spec
    1.23        +4  -3      openpkg-src/lzo/lzo.spec
    1.21        +4  -3      openpkg-src/lzop/lzop.spec
    1.34        +4  -3      openpkg-src/mm/mm.spec
    1.16        +4  -3      openpkg-src/netdude/netdude.spec
    1.17        +4  -3      openpkg-src/newt/newt.spec
    1.69        +4  -3      openpkg-src/nmap/nmap.spec
    1.138       +4  -3      openpkg-src/openldap/openldap.spec
    1.13        +4  -3      openpkg-src/openpkg-rc/openpkg-rc.spec
    1.64        +4  -3      openpkg-src/petidomo/petidomo.spec
    1.109       +4  -3      openpkg-src/php/php.spec
    1.30        +4  -3      openpkg-src/php5/php5.spec
    1.38        +4  -3      openpkg-src/pth/pth.spec
    1.36        +4  -3      openpkg-src/sa/sa.spec
    1.47        +4  -3      openpkg-src/shiela/shiela.spec
    1.12        +4  -3      openpkg-src/sio/sio.spec
    1.22        +4  -3      openpkg-src/snmpdx/snmpdx.spec
    1.32        +4  -3      openpkg-src/str/str.spec
    1.6         +4  -3      openpkg-src/svs/svs.spec
    1.24        +4  -3      openpkg-src/uuid/uuid.spec
    1.19        +4  -3      openpkg-src/val/val.spec
    1.19        +4  -3      openpkg-src/var/var.spec
    1.42        +4  -3      openpkg-src/wml/wml.spec
    1.11        +4  -3      openpkg-src/xds/xds.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/al/al.spec
  ============================================================================
  $ cvs diff -u -r1.16 -r1.17 al.spec
  --- openpkg-src/al/al.spec    24 Mar 2005 11:18:24 -0000      1.16
  +++ openpkg-src/al/al.spec    15 Jun 2005 14:01:04 -0000      1.17
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      0.9.1
  -Release:      20040207
  +Release:      20050615
   
   #   package options
   %option       with_ex  no
  @@ -44,8 +44,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_ex}" == "yes"
   BuildPreReq:  ex
   PreReq:       ex
  @@ -71,6 +71,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/as-gui/as-gui.spec
  ============================================================================
  $ cvs diff -u -r1.63 -r1.64 as-gui.spec
  --- openpkg-src/as-gui/as-gui.spec    24 Mar 2005 11:18:26 -0000      1.63
  +++ openpkg-src/as-gui/as-gui.spec    15 Jun 2005 14:01:05 -0000      1.64
  @@ -33,7 +33,7 @@
   Group:        Editor
   License:      GPL
   Version:      0.7.7
  -Release:      20040920
  +Release:      20050615
   
   #   package options
   %option       with_mico    yes
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, qt >= 3.2.3, pkgconfig, make
  -PreReq:       OpenPKG, openpkg >= 20040130, qt >= 3.2.3
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, qt >= 3.2.3, pkgconfig, make
  +PreReq:       OpenPKG, openpkg >= 20050615, qt >= 3.2.3
   %if "%{with_mico}" == "yes"
   BuildPreReq:  mico
   PreReq:       mico
  @@ -71,6 +71,7 @@
   
   %prep
       %setup -q -n as-gui-%{version}
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cfg/cfg.spec
  ============================================================================
  $ cvs diff -u -r1.24 -r1.25 cfg.spec
  --- openpkg-src/cfg/cfg.spec  24 Mar 2005 11:18:33 -0000      1.24
  +++ openpkg-src/cfg/cfg.spec  15 Jun 2005 14:01:06 -0000      1.25
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT-style
   Version:      0.9.9
  -Release:      20050218
  +Release:      20050615
   
   #   package options
   %option       with_perl no
  @@ -44,8 +44,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, gcc
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_perl}" == "yes"
   BuildPreReq:  perl, perl-openpkg
   PreReq:       perl
  @@ -77,6 +77,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ettercap/ettercap.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 ettercap.spec
  --- openpkg-src/ettercap/ettercap.spec        29 May 2005 18:06:07 -0000      
1.9
  +++ openpkg-src/ettercap/ettercap.spec        15 Jun 2005 14:01:06 -0000      
1.10
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.7.3
  -Release:      20050529
  +Release:      20050615
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/ettercap/ettercap-NG-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   BuildPreReq:  ncurses, openssl, pcre, libiconv, libnet, libpcap, zlib
   PreReq:       ncurses, openssl, pcre, libiconv, libnet, libpcap, zlib
   AutoReq:      no
  @@ -64,6 +64,7 @@
   
   %prep
       %setup -q -n ettercap-NG-%{version}
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ex/ex.spec
  ============================================================================
  $ cvs diff -u -r1.24 -r1.25 ex.spec
  --- openpkg-src/ex/ex.spec    10 Jun 2005 13:50:54 -0000      1.24
  +++ openpkg-src/ex/ex.spec    15 Jun 2005 14:01:07 -0000      1.25
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      1.0.4
  -Release:      20050610
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/ex/ex-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -71,6 +71,7 @@
       %{l_shtool} subst \
           -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/flow2rrd/flow2rrd.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 flow2rrd.spec
  --- openpkg-src/flow2rrd/flow2rrd.spec        24 Mar 2005 11:18:46 -0000      
1.11
  +++ openpkg-src/flow2rrd/flow2rrd.spec        15 Jun 2005 14:01:08 -0000      
1.12
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.9.1
  -Release:      20041230
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/flow2rrd/flow2rrd-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, perl
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, perl
  +PreReq:       OpenPKG, openpkg >= 20050615
   PreReq:       perl, perl-time, perl-text, perl-net >= 5.8.6-20041217, 
perl-www
   PreReq:       cfg, cfg::with_perl = yes
   PreReq:       flowtools, flowtools::with_perl = yes
  @@ -66,6 +66,7 @@
   %prep
       %setup -q
       %patch -p0
  +    cp %{l_shtool} .
   
   %build
       #   build the program
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/fsl/fsl.spec
  ============================================================================
  $ cvs diff -u -r1.78 -r1.79 fsl.spec
  --- openpkg-src/fsl/fsl.spec  24 Mar 2005 11:18:50 -0000      1.78
  +++ openpkg-src/fsl/fsl.spec  15 Jun 2005 14:01:09 -0000      1.79
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT-style
   Version:      1.6.0
  -Release:      20050308
  +Release:      20050615
   
   #   package options
   %option       with_fsl_debuglogcode   no
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -75,6 +75,7 @@
           -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure lib_*/configure
       %patch -p0
  +    for i in . ./lib_cfg/shtool ./lib_l2/shtool ./lib_pcre/shtool; do cp 
%{l_shtool} $i; done
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/getopt/getopt.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 getopt.spec
  --- openpkg-src/getopt/getopt.spec    24 Mar 2005 11:18:53 -0000      1.9
  +++ openpkg-src/getopt/getopt.spec    15 Jun 2005 14:01:10 -0000      1.10
  @@ -33,7 +33,7 @@
   Group:        System
   License:      LGPL
   Version:      20030307
  -Release:      20040207
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/getopt/getopt-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, gcc
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -60,6 +60,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/iselect/iselect.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 iselect.spec
  --- openpkg-src/iselect/iselect.spec  24 Mar 2005 11:19:07 -0000      1.30
  +++ openpkg-src/iselect/iselect.spec  15 Jun 2005 14:01:11 -0000      1.31
  @@ -33,7 +33,7 @@
   Group:        Terminal
   License:      BSD
   Version:      1.3.0
  -Release:      20041008
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/iselect/iselect-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   BuildPreReq:  ncurses
   PreReq:       ncurses
   AutoReq:      no
  @@ -65,6 +65,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} ./etc/shtool
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/jitterbug/jitterbug.spec
  ============================================================================
  $ cvs diff -u -r1.40 -r1.41 jitterbug.spec
  --- openpkg-src/jitterbug/jitterbug.spec      24 Mar 2005 11:19:09 -0000      
1.40
  +++ openpkg-src/jitterbug/jitterbug.spec      15 Jun 2005 14:01:12 -0000      
1.41
  @@ -33,7 +33,7 @@
   Group:        Database
   License:      GPL
   Version:      1.6.2.3
  -Release:      20040203
  +Release:      20050615
   
   #   list of sources
   Source0:      
ftp://ftp.openpkg.org/sources/DST/jitterbug/ossp-jitterbug-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130, MTA, apache, gzip
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615, MTA, apache, gzip
   BuildPreReq:  zlib
   PreReq:       zlib
   AutoReq:      no
  @@ -56,6 +56,7 @@
   
   %prep
       %setup -q -n ossp-jitterbug-%{version}
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/l2/l2.spec
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 l2.spec
  --- openpkg-src/l2/l2.spec    24 Mar 2005 11:19:12 -0000      1.29
  +++ openpkg-src/l2/l2.spec    15 Jun 2005 14:01:13 -0000      1.30
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT-style
   Version:      0.9.10
  -Release:      20050308
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/l2/l2-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, make
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, make
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -82,6 +82,7 @@
       %{l_shtool} subst \
           -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libnetdude/libnetdude.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 libnetdude.spec
  --- openpkg-src/libnetdude/libnetdude.spec    6 May 2005 07:11:19 -0000       
1.13
  +++ openpkg-src/libnetdude/libnetdude.spec    15 Jun 2005 14:01:15 -0000      
1.14
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      MIT-style
   Version:      0.7
  -Release:      20050506
  +Release:      20050615
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/netdude/libnetdude-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, libpcap, libpcapnav >= 0.5, 
glib, tcpdump
  -PreReq:       OpenPKG, openpkg >= 20040130, libpcap, libpcapnav >= 0.5, 
glib, tcpdump
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, libpcap, libpcapnav >= 0.5, 
glib, tcpdump
  +PreReq:       OpenPKG, openpkg >= 20050615, libpcap, libpcapnav >= 0.5, 
glib, tcpdump
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -61,6 +61,7 @@
   %prep
       %setup -q
       %patch -p0
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libpcapnav/libpcapnav.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 libpcapnav.spec
  --- openpkg-src/libpcapnav/libpcapnav.spec    6 May 2005 06:38:09 -0000       
1.11
  +++ openpkg-src/libpcapnav/libpcapnav.spec    15 Jun 2005 14:01:16 -0000      
1.12
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      MIT-style
   Version:      0.6
  -Release:      20050506
  +Release:      20050615
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/netdude/libpcapnav-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, libpcap
  -PreReq:       OpenPKG, openpkg >= 20040130, libpcap
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, libpcap
  +PreReq:       OpenPKG, openpkg >= 20050615, libpcap
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -65,6 +65,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libradius/libradius.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 libradius.spec
  --- openpkg-src/libradius/libradius.spec      24 Mar 2005 11:19:19 -0000      
1.6
  +++ openpkg-src/libradius/libradius.spec      15 Jun 2005 14:01:17 -0000      
1.7
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      BSD
   Version:      20040920
  -Release:      20040920
  +Release:      20050615
   
   #   list of sources
   Source0:      
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/libradius/libradius-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -64,6 +64,7 @@
   
   %prep
       %setup -q -n libradius
  +    cp %{l_shtool} .
   
   %build
       %{l_shtool} subst \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lmtp2nntp/lmtp2nntp.spec
  ============================================================================
  $ cvs diff -u -r1.66 -r1.67 lmtp2nntp.spec
  --- openpkg-src/lmtp2nntp/lmtp2nntp.spec      24 Mar 2005 11:19:22 -0000      
1.66
  +++ openpkg-src/lmtp2nntp/lmtp2nntp.spec      15 Jun 2005 14:01:18 -0000      
1.67
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      1.3.0
  -Release:      20041207
  +Release:      20050615
   
   #   list of sources
   Source0:      
ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/lmtp2nntp-%{version}.tar.gz
  @@ -43,8 +43,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, gcc
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -69,6 +69,7 @@
   
   %prep
       %setup -q
  +    for i in . ./lib_ex/shtool ./lib_l2/shtool ./lib_pcre/shtool 
./lib_popt/shtool ./lib_sa/shtool ./lib_str/shtool ./lib_tai/shtool 
./lib_val/shtool ./lib_var/shtool; do cp %{l_shtool} $i; done
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lzo/lzo.spec
  ============================================================================
  $ cvs diff -u -r1.22 -r1.23 lzo.spec
  --- openpkg-src/lzo/lzo.spec  30 May 2005 15:36:01 -0000      1.22
  +++ openpkg-src/lzo/lzo.spec  15 Jun 2005 14:01:19 -0000      1.23
  @@ -33,7 +33,7 @@
   Group:        Compression
   License:      GPL
   Version:      2.00
  -Release:      20050530
  +Release:      20050615
   
   #   list of sources
   Source0:      
http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -59,6 +59,7 @@
   
   %prep
       %setup -q
  +    cp {l_shtool} ./autoconf/shtool
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lzop/lzop.spec
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 lzop.spec
  --- openpkg-src/lzop/lzop.spec        30 May 2005 15:37:21 -0000      1.20
  +++ openpkg-src/lzop/lzop.spec        15 Jun 2005 14:01:21 -0000      1.21
  @@ -33,7 +33,7 @@
   Group:        Compression
   License:      GPL
   Version:      1.01
  -Release:      20050530
  +Release:      20050615
   
   #   list of sources
   Source0:      http://www.lzop.org/download/lzop-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, make
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, make
  +PreReq:       OpenPKG, openpkg >= 20050615
   BuildPreReq:  lzo >= 1.08-20021122
   PreReq:       lzo >= 1.08-20021122
   AutoReq:      no
  @@ -61,6 +61,7 @@
   %prep
       %setup -q
       %{l_shtool} subst -e 's;__lzo_init2;__lzo_init_v2;' configure
  +    cp %{l_shtool} ./acconfig/shtool
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mm/mm.spec
  ============================================================================
  $ cvs diff -u -r1.33 -r1.34 mm.spec
  --- openpkg-src/mm/mm.spec    24 Mar 2005 11:19:29 -0000      1.33
  +++ openpkg-src/mm/mm.spec    15 Jun 2005 14:01:22 -0000      1.34
  @@ -33,7 +33,7 @@
   Group:        System
   License:      BSD
   Version:      1.3.1
  -Release:      20041018
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/mm/mm-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -68,6 +68,7 @@
       %{l_shtool} subst \
           -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/netdude/netdude.spec
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 netdude.spec
  --- openpkg-src/netdude/netdude.spec  6 May 2005 07:28:12 -0000       1.15
  +++ openpkg-src/netdude/netdude.spec  15 Jun 2005 14:01:22 -0000      1.16
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      MIT-style
   Version:      0.4.6
  -Release:      20050506
  +Release:      20050615
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/netdude/netdude-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, libpcapnav >= 0.5, libnetdude >= 
0.6, glib, gtk
  -PreReq:       OpenPKG, openpkg >= 20040130, libpcapnav >= 0.5, libnetdude >= 
0.6, glib, gtk
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, libpcapnav >= 0.5, libnetdude >= 
0.6, glib, gtk
  +PreReq:       OpenPKG, openpkg >= 20050615, libpcapnav >= 0.5, libnetdude >= 
0.6, glib, gtk
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -65,6 +65,7 @@
   %prep
       %setup -q
       %patch -p0
  +    cp %{l_shtool} .
   
   %build
       ( echo "ac_cv_lib_fam_main=no"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/newt/newt.spec
  ============================================================================
  $ cvs diff -u -r1.16 -r1.17 newt.spec
  --- openpkg-src/newt/newt.spec        24 Mar 2005 11:19:40 -0000      1.16
  +++ openpkg-src/newt/newt.spec        15 Jun 2005 14:01:22 -0000      1.17
  @@ -37,7 +37,7 @@
   Group:        Terminal
   License:      LGPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20050323
  +Release:      20050615
   
   #   list of sources
   Source0:      
ftp://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/newt-%{V_major}-%{V_minor}.src.rpm
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040217, slang, popt, gcc
  -PreReq:       OpenPKG, openpkg >= 20040217, slang
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, slang, popt, gcc
  +PreReq:       OpenPKG, openpkg >= 20050615, slang
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -73,6 +73,7 @@
       %{l_gzip} -d -c newt-%{V_major}.tar.gz | %{l_tar} xf -
       %patch -p0 -d newt-%{V_major}
       chmod u+r newt-%{V_major}/*.orig
  +    cp %{l_shtool} ./newt-0.51.6/shtool
   
   %build
       #   determine available terminal library
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/nmap/nmap.spec
  ============================================================================
  $ cvs diff -u -r1.68 -r1.69 nmap.spec
  --- openpkg-src/nmap/nmap.spec        24 Mar 2005 11:19:41 -0000      1.68
  +++ openpkg-src/nmap/nmap.spec        15 Jun 2005 14:01:24 -0000      1.69
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      3.81
  -Release:      20050207
  +Release:      20050615
   
   #   list of sources
   Source0:      http://www.insecure.org/nmap/dist/nmap-%{version}.tgz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc, bison, flex
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, make, gcc, bison, flex
  +PreReq:       OpenPKG, openpkg >= 20050615
   BuildPreReq:  libpcap, openssl, getopt
   PreReq:       libpcap, openssl, getopt
   AutoReq:      no
  @@ -77,6 +77,7 @@
           -e 's;\(socklen_t int\);\1 size_t;g' \
           aclocal.m4 \
           configure
  +    cp %{l_shtool} .
   
   %build
       cppflags="%{l_cppflags}"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openldap/openldap.spec
  ============================================================================
  $ cvs diff -u -r1.137 -r1.138 openldap.spec
  --- openpkg-src/openldap/openldap.spec        11 Jun 2005 07:52:38 -0000      
1.137
  +++ openpkg-src/openldap/openldap.spec        15 Jun 2005 14:01:27 -0000      
1.138
  @@ -33,7 +33,7 @@
   Group:        Database
   License:      GPL
   Version:      2.2.27
  -Release:      20050611
  +Release:      20050615
   
   #   package options
   %option       with_fsl   yes
  @@ -51,8 +51,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20050615
   BuildPreReq:  readline, openssl, db >= 4.2, pth
   PreReq:       readline, openssl, db >= 4.2, pth
   %if "%{with_fsl}" == "yes"
  @@ -82,6 +82,7 @@
   %prep
       %setup -q
       %patch -p0
  +    cp %{l_shtool} ./build/shtool
   
   %build
       #   configure toolkit
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-rc/openpkg-rc.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 openpkg-rc.spec
  --- openpkg-src/openpkg-rc/openpkg-rc.spec    24 Mar 2005 11:19:45 -0000      
1.12
  +++ openpkg-src/openpkg-rc/openpkg-rc.spec    15 Jun 2005 14:01:28 -0000      
1.13
  @@ -33,7 +33,7 @@
   Group:        Utility
   License:      GPL
   Version:      0.7.3
  -Release:      20040207
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/rc/rc-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, perl
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, perl
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -62,6 +62,7 @@
   
   %prep
       %setup -q -n rc-%{version}
  +    for i in . ./lib_ex/shtool ./lib_popt/shtool; do cp %{l_shtool} $i; done
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/petidomo/petidomo.spec
  ============================================================================
  $ cvs diff -u -r1.63 -r1.64 petidomo.spec
  --- openpkg-src/petidomo/petidomo.spec        24 Mar 2005 11:19:59 -0000      
1.63
  +++ openpkg-src/petidomo/petidomo.spec        15 Jun 2005 14:01:29 -0000      
1.64
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0b6
  -Release:      20050215
  +Release:      20050615
   
   #   package options
   %option       with_fsl  yes
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, bison, flex
  -PreReq:       OpenPKG, openpkg >= 20040130, MTA
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, bison, flex
  +PreReq:       OpenPKG, openpkg >= 20050615, MTA
   %if "%{with_fsl}" == "yes"
   BuildPreReq:  fsl >= 1.4.0-20040310
   PreReq:       fsl >= 1.4.0-20040310
  @@ -72,6 +72,7 @@
   %prep
       %setup -q
       %setup -q -T -D -a 1
  +    for i in . ./etc/shtool; do cp %{l_shtool} $i; done
   
   %build
       #   build program
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  ============================================================================
  $ cvs diff -u -r1.108 -r1.109 php.spec
  --- openpkg-src/php/php.spec  7 Apr 2005 11:01:17 -0000       1.108
  +++ openpkg-src/php/php.spec  15 Jun 2005 14:01:29 -0000      1.109
  @@ -37,7 +37,7 @@
   Group:        Language
   License:      PHP
   Version:      %{V_php}
  -Release:      20050407
  +Release:      20050615
   
   #   package options
   %option       with_bc                   no
  @@ -108,8 +108,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc, sed, flex, bison
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, gcc, sed, flex, bison
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_mysql}" == "yes"
   BuildPreReq:  mysql
   PreReq:       mysql
  @@ -261,6 +261,7 @@
       %{l_shtool} subst \
           %{l_value -s l_prefix l_rpm l_rpmtool} \
           scripts/phpize.in
  +    cp %{l_shtool} ./build/shtool
   
   %build
       #   configure package
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/php5/php5.spec
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 php5.spec
  --- openpkg-src/php5/php5.spec        11 Jun 2005 08:00:50 -0000      1.29
  +++ openpkg-src/php5/php5.spec        15 Jun 2005 14:01:30 -0000      1.30
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      PHP
   Version:      5.0.4
  -Release:      20050611
  +Release:      20050615
   
   #   package options
   %option       with_calendar      no
  @@ -98,8 +98,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc, flex, bison
  -PreReq:       OpenPKG, openpkg >= 20040130, MTA
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, gcc, flex, bison
  +PreReq:       OpenPKG, openpkg >= 20050615, MTA
   %if "%{with_mysql}" == "yes"
   BuildPreReq:  mysql
   PreReq:       mysql
  @@ -235,6 +235,7 @@
           -e 's;\(/include\)/freetype2;\1;' \
           configure \
           ext/gd/config.m4
  +    cp %{l_shtool} ./build/shtool
   
   %build
       #   configure package
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pth/pth.spec
  ============================================================================
  $ cvs diff -u -r1.37 -r1.38 pth.spec
  --- openpkg-src/pth/pth.spec  24 Mar 2005 11:20:07 -0000      1.37
  +++ openpkg-src/pth/pth.spec  15 Jun 2005 14:01:31 -0000      1.38
  @@ -33,7 +33,7 @@
   Group:        System
   License:      GPL
   Version:      2.0.4
  -Release:      20050218
  +Release:      20050615
   
   #   package options
   %option       with_optimize no
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -67,6 +67,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       touch config.cache
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sa/sa.spec
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 sa.spec
  --- openpkg-src/sa/sa.spec    24 Mar 2005 11:20:13 -0000      1.35
  +++ openpkg-src/sa/sa.spec    15 Jun 2005 14:01:31 -0000      1.36
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      1.2.4
  -Release:      20050308
  +Release:      20050615
   
   #   package options
   %option       with_ex  no
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_ex}" == "yes"
   BuildPreReq:  ex
   PreReq:       ex
  @@ -72,6 +72,7 @@
   %prep
       %setup -q
       %patch -p0
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/shiela/shiela.spec
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 shiela.spec
  --- openpkg-src/shiela/shiela.spec    24 Mar 2005 11:20:17 -0000      1.46
  +++ openpkg-src/shiela/shiela.spec    15 Jun 2005 14:01:32 -0000      1.47
  @@ -33,7 +33,7 @@
   Group:        SCM
   License:      GPL
   Version:      1.1.5
  -Release:      20050112
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/shiela/shiela-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, perl
  -PreReq:       OpenPKG, openpkg >= 20040130, perl, cvs, diffutils, xdelta, 
sharutils, MTA
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, perl
  +PreReq:       OpenPKG, openpkg >= 20050615, perl, cvs, diffutils, xdelta, 
sharutils, MTA
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -66,6 +66,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       ./configure \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sio/sio.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 sio.spec
  --- openpkg-src/sio/sio.spec  10 Jun 2005 13:50:56 -0000      1.11
  +++ openpkg-src/sio/sio.spec  15 Jun 2005 14:01:32 -0000      1.12
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      0.9.2
  -Release:      20050610
  +Release:      20050615
   
   #   package options
   %option       with_ex    no
  @@ -47,8 +47,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_ex}" == "yes"
   BuildPreReq:  ex
   PreReq:       ex
  @@ -87,6 +87,7 @@
       %{l_shtool} subst \
           -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure lib_*/configure
  +    for i in . ./lib_al/shtool ./lib_sa/shtool; do cp %{l_shtool} $i; done
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/snmpdx/snmpdx.spec
  ============================================================================
  $ cvs diff -u -r1.21 -r1.22 snmpdx.spec
  --- openpkg-src/snmpdx/snmpdx.spec    24 Mar 2005 11:20:22 -0000      1.21
  +++ openpkg-src/snmpdx/snmpdx.spec    15 Jun 2005 14:01:33 -0000      1.22
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.2.10
  -Release:      20041018
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/snmpdx/snmpdx-%{version}.tar.gz
  @@ -42,8 +42,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, snmp
  -PreReq:       OpenPKG, openpkg >= 20040130, perl, snmp
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, perl, snmp
  +PreReq:       OpenPKG, openpkg >= 20050615, perl, snmp
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -63,6 +63,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       #   configure program
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/str/str.spec
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 str.spec
  --- openpkg-src/str/str.spec  24 Mar 2005 11:20:25 -0000      1.31
  +++ openpkg-src/str/str.spec  15 Jun 2005 14:01:33 -0000      1.32
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      MIT/BSD-style
   Version:      0.9.10
  -Release:      20050124
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/str/str-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -62,6 +62,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/svs/svs.spec
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 svs.spec
  --- openpkg-src/svs/svs.spec  24 Mar 2005 11:20:26 -0000      1.5
  +++ openpkg-src/svs/svs.spec  15 Jun 2005 14:01:35 -0000      1.6
  @@ -33,7 +33,7 @@
   Group:        Converter
   License:      MIT-style
   Version:      1.0.2
  -Release:      20050206
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/svs/svs-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -62,6 +62,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       ./configure \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/uuid/uuid.spec
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 uuid.spec
  --- openpkg-src/uuid/uuid.spec        7 Apr 2005 19:11:11 -0000       1.23
  +++ openpkg-src/uuid/uuid.spec        15 Jun 2005 14:01:36 -0000      1.24
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      1.2.0
  -Release:      20050407
  +Release:      20050615
   
   #   package options
   %option       with_dce  no
  @@ -45,8 +45,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_perl}" == "yes"
   BuildPreReq:  perl, perl-openpkg
   PreReq:       perl
  @@ -79,6 +79,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/val/val.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 val.spec
  --- openpkg-src/val/val.spec  10 Jun 2005 13:50:56 -0000      1.18
  +++ openpkg-src/val/val.spec  15 Jun 2005 14:01:37 -0000      1.19
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      0.9.3
  -Release:      20050610
  +Release:      20050615
   
   #   package options
   %option       with_ex  no
  @@ -44,8 +44,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   %if "%{with_ex}" == "yes"
   BuildPreReq:  ex
   PreReq:       ex
  @@ -77,6 +77,7 @@
       %{l_shtool} subst \
           -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
           configure
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/var/var.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 var.spec
  --- openpkg-src/var/var.spec  24 Mar 2005 11:20:38 -0000      1.18
  +++ openpkg-src/var/var.spec  15 Jun 2005 14:01:38 -0000      1.19
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      1.1.2
  -Release:      20041031
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/var/var-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -72,6 +72,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/wml/wml.spec
  ============================================================================
  $ cvs diff -u -r1.41 -r1.42 wml.spec
  --- openpkg-src/wml/wml.spec  13 Jun 2005 11:46:48 -0000      1.41
  +++ openpkg-src/wml/wml.spec  15 Jun 2005 14:01:40 -0000      1.42
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      GPL
   Version:      2.0.9
  -Release:      20050613
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://thewml.org/distrib/wml-%{version}.tar.gz
  @@ -46,8 +46,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, gcc
  -PreReq:       OpenPKG, openpkg >= 20040130, perl
  +BuildPreReq:  OpenPKG, openpkg >= 20050615, perl, gcc
  +PreReq:       OpenPKG, openpkg >= 20050615, perl
   BuildPreReq:  png, zlib, ncurses
   PreReq:       png, zlib, ncurses
   AutoReq:      no
  @@ -81,6 +81,7 @@
       cp %{SOURCE configure.gm4} wml_backend/p4_gm4/configure
       cp %{SOURCE configure.iselect} wml_aux/iselect/configure
       cp %{SOURCE configure.gd} wml_common/gd/configure
  +    for i in ./etc/shtool ./wml_aux/iselect/etc/shtool 
./wml_backend/p2_mp4h/shtool ./wml_backend/p3_eperl/etc/shtool 
./wml_backend/p9_slice/etc/shtool; do cp %{l_shtool} $i; done
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/xds/xds.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 xds.spec
  --- openpkg-src/xds/xds.spec  3 Jun 2005 06:16:35 -0000       1.10
  +++ openpkg-src/xds/xds.spec  15 Jun 2005 14:01:41 -0000      1.11
  @@ -33,7 +33,7 @@
   Group:        System
   License:      MIT/X11-style
   Version:      0.9.2
  -Release:      20050603
  +Release:      20050615
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/xds/xds-%{version}.tar.gz
  @@ -41,8 +41,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20050615
  +PreReq:       OpenPKG, openpkg >= 20050615
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -65,6 +65,7 @@
   
   %prep
       %setup -q
  +    cp %{l_shtool} .
   
   %build
       CC="%{l_cc}" \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to