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: 23-Jun-2005 15:58:36
Branch: OPENPKG_2_3_SOLID Handle: 2005062314582610
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/al al.spec
openpkg-src/cfg cfg.spec
openpkg-src/ex ex.spec
openpkg-src/fsl fsl.spec
openpkg-src/getopt getopt.spec
openpkg-src/iselect iselect.spec
openpkg-src/l2 l2.spec
openpkg-src/lmtp2nntp lmtp2nntp.spec
openpkg-src/lzo lzo.spec
openpkg-src/lzop lzop.spec
openpkg-src/mm mm.spec
openpkg-src/newt newt.spec
openpkg-src/nmap nmap.spec
openpkg-src/openldap openldap.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/uuid uuid.spec
openpkg-src/val val.spec
openpkg-src/var var.spec
openpkg-src/wml wml.spec
openpkg-src/xds xds.spec
Log:
MFC: SA-2005.011-shtool; CAN-2005-1751, CAN-2005-1759
Summary:
Revision Changes Path
1.15.2.2 +4 -3 openpkg-src/al/al.spec
1.23.2.2 +4 -3 openpkg-src/cfg/cfg.spec
1.22.2.2 +4 -3 openpkg-src/ex/ex.spec
1.76.2.3 +4 -3 openpkg-src/fsl/fsl.spec
1.8.2.2 +4 -3 openpkg-src/getopt/getopt.spec
1.29.2.2 +4 -3 openpkg-src/iselect/iselect.spec
1.27.2.2 +4 -3 openpkg-src/l2/l2.spec
1.65.2.2 +4 -3 openpkg-src/lmtp2nntp/lmtp2nntp.spec
1.20.2.2 +4 -3 openpkg-src/lzo/lzo.spec
1.18.2.2 +4 -3 openpkg-src/lzop/lzop.spec
1.32.2.2 +4 -3 openpkg-src/mm/mm.spec
1.14.2.2 +4 -3 openpkg-src/newt/newt.spec
1.67.2.2 +7 -3 openpkg-src/nmap/nmap.spec
1.131.2.2 +4 -3 openpkg-src/openldap/openldap.spec
1.103.2.3 +4 -3 openpkg-src/php/php.spec
1.26.2.2 +4 -3 openpkg-src/php5/php5.spec
1.36.2.2 +4 -3 openpkg-src/pth/pth.spec
1.33.2.2 +4 -3 openpkg-src/sa/sa.spec
1.45.2.2 +4 -3 openpkg-src/shiela/shiela.spec
1.9.2.2 +4 -3 openpkg-src/sio/sio.spec
1.20.2.2 +4 -3 openpkg-src/snmpdx/snmpdx.spec
1.30.2.2 +4 -3 openpkg-src/str/str.spec
1.21.2.2 +4 -3 openpkg-src/uuid/uuid.spec
1.16.2.2 +4 -3 openpkg-src/val/val.spec
1.17.2.2 +4 -3 openpkg-src/var/var.spec
1.39.2.2 +5 -3 openpkg-src/wml/wml.spec
1.8.2.2 +4 -3 openpkg-src/xds/xds.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/al/al.spec
============================================================================
$ cvs diff -u -r1.15.2.1 -r1.15.2.2 al.spec
--- openpkg-src/al/al.spec 21 Feb 2005 17:06:11 -0000 1.15.2.1
+++ openpkg-src/al/al.spec 23 Jun 2005 13:58:26 -0000 1.15.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 0.9.1
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_ex no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
%if "%{with_ex}" == "yes"
BuildPreReq: ex
PreReq: ex
@@ -72,6 +72,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cfg/cfg.spec
============================================================================
$ cvs diff -u -r1.23.2.1 -r1.23.2.2 cfg.spec
--- openpkg-src/cfg/cfg.spec 21 Feb 2005 17:06:26 -0000 1.23.2.1
+++ openpkg-src/cfg/cfg.spec 23 Jun 2005 13:58:26 -0000 1.23.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT-style
Version: 0.9.9
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_perl no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, gcc
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, gcc
+PreReq: OpenPKG, openpkg >= 2.3.3
%if "%{with_perl}" == "yes"
BuildPreReq: perl, perl-openpkg
PreReq: perl
@@ -78,6 +78,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ex/ex.spec
============================================================================
$ cvs diff -u -r1.22.2.1 -r1.22.2.2 ex.spec
--- openpkg-src/ex/ex.spec 21 Feb 2005 17:06:41 -0000 1.22.2.1
+++ openpkg-src/ex/ex.spec 23 Jun 2005 13:58:27 -0000 1.22.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 1.0.4
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/lib/ex/ex-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -69,6 +69,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fsl/fsl.spec
============================================================================
$ cvs diff -u -r1.76.2.2 -r1.76.2.3 fsl.spec
--- openpkg-src/fsl/fsl.spec 8 Mar 2005 09:27:24 -0000 1.76.2.2
+++ openpkg-src/fsl/fsl.spec 23 Jun 2005 13:58:27 -0000 1.76.2.3
@@ -34,7 +34,7 @@
Group: System
License: MIT-style
Version: 1.6.0
-Release: 2.3.1
+Release: 2.3.2
# package options
%option with_fsl_debuglogcode no
@@ -48,8 +48,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -76,6 +76,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.8.2.1 -r1.8.2.2 getopt.spec
--- openpkg-src/getopt/getopt.spec 21 Feb 2005 17:06:49 -0000 1.8.2.1
+++ openpkg-src/getopt/getopt.spec 23 Jun 2005 13:58:27 -0000 1.8.2.2
@@ -34,7 +34,7 @@
Group: System
License: LGPL
Version: 20030307
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/lib/getopt/getopt-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, gcc
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, gcc
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -61,6 +61,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/iselect/iselect.spec
============================================================================
$ cvs diff -u -r1.29.2.1 -r1.29.2.2 iselect.spec
--- openpkg-src/iselect/iselect.spec 21 Feb 2005 17:07:09 -0000 1.29.2.1
+++ openpkg-src/iselect/iselect.spec 23 Jun 2005 13:58:28 -0000 1.29.2.2
@@ -34,7 +34,7 @@
Group: Terminal
License: BSD
Version: 1.3.0
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/iselect/iselect-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
BuildPreReq: ncurses
PreReq: ncurses
AutoReq: no
@@ -66,6 +66,7 @@
%prep
%setup -q
+ cp %{l_shtool} ./etc/shtool
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/l2/l2.spec
============================================================================
$ cvs diff -u -r1.27.2.1 -r1.27.2.2 l2.spec
--- openpkg-src/l2/l2.spec 21 Feb 2005 17:07:14 -0000 1.27.2.1
+++ openpkg-src/l2/l2.spec 23 Jun 2005 13:58:28 -0000 1.27.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT-style
Version: 0.9.10
-Release: 2.3.0
+Release: 2.3.1
# 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 >= 2.3.0, make
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, make
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -81,6 +81,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/lmtp2nntp/lmtp2nntp.spec
============================================================================
$ cvs diff -u -r1.65.2.1 -r1.65.2.2 lmtp2nntp.spec
--- openpkg-src/lmtp2nntp/lmtp2nntp.spec 21 Feb 2005 17:07:29 -0000
1.65.2.1
+++ openpkg-src/lmtp2nntp/lmtp2nntp.spec 23 Jun 2005 13:58:28 -0000
1.65.2.2
@@ -34,7 +34,7 @@
Group: Mail
License: GPL
Version: 1.3.0
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0:
ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/lmtp2nntp-%{version}.tar.gz
@@ -44,8 +44,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, gcc
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, gcc
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -70,6 +70,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.20.2.1 -r1.20.2.2 lzo.spec
--- openpkg-src/lzo/lzo.spec 21 Feb 2005 17:07:31 -0000 1.20.2.1
+++ openpkg-src/lzo/lzo.spec 23 Jun 2005 13:58:29 -0000 1.20.2.2
@@ -34,7 +34,7 @@
Group: Compression
License: GPL
Version: 1.08
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0:
http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -60,6 +60,7 @@
%prep
%setup -q
+ cp %{l_shtool} ./acconfig/shtool
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lzop/lzop.spec
============================================================================
$ cvs diff -u -r1.18.2.1 -r1.18.2.2 lzop.spec
--- openpkg-src/lzop/lzop.spec 21 Feb 2005 17:07:31 -0000 1.18.2.1
+++ openpkg-src/lzop/lzop.spec 23 Jun 2005 13:58:29 -0000 1.18.2.2
@@ -34,7 +34,7 @@
Group: Compression
License: GPL
Version: 1.01
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0:
http://www.oberhumer.com/opensource/lzop/download/lzop-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, make
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, make
+PreReq: OpenPKG, openpkg >= 2.3.3
BuildPreReq: lzo >= 1.08-2.3.0
PreReq: lzo >= 1.08-2.3.0
AutoReq: no
@@ -61,6 +61,7 @@
%prep
%setup -q
+ cp %{l_shtool} ./acconfig/shtool
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mm/mm.spec
============================================================================
$ cvs diff -u -r1.32.2.1 -r1.32.2.2 mm.spec
--- openpkg-src/mm/mm.spec 21 Feb 2005 17:07:37 -0000 1.32.2.1
+++ openpkg-src/mm/mm.spec 23 Jun 2005 13:58:29 -0000 1.32.2.2
@@ -34,7 +34,7 @@
Group: System
License: BSD
Version: 1.3.1
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/lib/mm/mm-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -69,6 +69,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/newt/newt.spec
============================================================================
$ cvs diff -u -r1.14.2.1 -r1.14.2.2 newt.spec
--- openpkg-src/newt/newt.spec 21 Feb 2005 17:07:45 -0000 1.14.2.1
+++ openpkg-src/newt/newt.spec 23 Jun 2005 13:58:29 -0000 1.14.2.2
@@ -38,7 +38,7 @@
Group: Terminal
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0:
ftp://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/newt-%{V_major}-%{V_minor}.src.rpm
@@ -48,8 +48,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, slang, popt, gcc
-PreReq: OpenPKG, openpkg >= 2.3.0, slang
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, slang, popt, gcc
+PreReq: OpenPKG, openpkg >= 2.3.3, slang
AutoReq: no
AutoReqProv: no
@@ -74,6 +74,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.67.2.1 -r1.67.2.2 nmap.spec
--- openpkg-src/nmap/nmap.spec 21 Feb 2005 17:07:45 -0000 1.67.2.1
+++ openpkg-src/nmap/nmap.spec 23 Jun 2005 13:58:30 -0000 1.67.2.2
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 3.81
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: http://www.insecure.org/nmap/dist/nmap-%{version}.tgz
@@ -43,8 +43,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, make, gcc, bison, flex
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, make, gcc, bison, flex
+PreReq: OpenPKG, openpkg >= 2.3.3
BuildPreReq: libpcap, openssl, getopt
PreReq: libpcap, openssl, getopt
AutoReq: no
@@ -78,6 +78,10 @@
-e 's;\(socklen_t int\);\1 size_t;g' \
aclocal.m4 \
configure
+ cp %{l_shtool} .
+ %{l_shtool} subst \
+ -e 's; -c -m 755 nmap -s ; -c -m 755 -s nmap ;' \
+ Makefile.in
%build
cppflags="%{l_cppflags}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.131.2.1 -r1.131.2.2 openldap.spec
--- openpkg-src/openldap/openldap.spec 21 Feb 2005 17:07:49 -0000
1.131.2.1
+++ openpkg-src/openldap/openldap.spec 23 Jun 2005 13:58:31 -0000
1.131.2.2
@@ -34,7 +34,7 @@
Group: Database
License: GPL
Version: 2.2.23
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_fsl yes
@@ -52,8 +52,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, make, gcc
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, make, gcc
+PreReq: OpenPKG, openpkg >= 2.3.3
BuildPreReq: readline, openssl, db >= 4.2, pth
PreReq: readline, openssl, db >= 4.2, pth
%if "%{with_fsl}" == "yes"
@@ -83,6 +83,7 @@
%prep
%setup -q
%patch -p0
+ cp %{l_shtool} ./build/shtool
%build
# configure toolkit
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.103.2.2 -r1.103.2.3 php.spec
--- openpkg-src/php/php.spec 25 Mar 2005 16:48:01 -0000 1.103.2.2
+++ openpkg-src/php/php.spec 23 Jun 2005 13:58:32 -0000 1.103.2.3
@@ -38,7 +38,7 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 2.3.1
+Release: 2.3.2
# package options
%option with_bc no
@@ -109,8 +109,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, gcc, sed, flex, bison
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, gcc, sed, flex, bison
+PreReq: OpenPKG, openpkg >= 2.3.3
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -262,6 +262,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.26.2.1 -r1.26.2.2 php5.spec
--- openpkg-src/php5/php5.spec 21 Feb 2005 17:08:11 -0000 1.26.2.1
+++ openpkg-src/php5/php5.spec 23 Jun 2005 13:58:32 -0000 1.26.2.2
@@ -34,7 +34,7 @@
Group: Language
License: PHP
Version: 5.0.3
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_calendar no
@@ -100,8 +100,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, gcc, flex, bison
-PreReq: OpenPKG, openpkg >= 2.3.0, MTA
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, gcc, flex, bison
+PreReq: OpenPKG, openpkg >= 2.3.3, MTA
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -238,6 +238,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.36.2.1 -r1.36.2.2 pth.spec
--- openpkg-src/pth/pth.spec 21 Feb 2005 17:08:18 -0000 1.36.2.1
+++ openpkg-src/pth/pth.spec 23 Jun 2005 13:58:33 -0000 1.36.2.2
@@ -34,7 +34,7 @@
Group: System
License: GPL
Version: 2.0.4
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_optimize no
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -68,6 +68,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
touch config.cache
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sa/sa.spec
============================================================================
$ cvs diff -u -r1.33.2.1 -r1.33.2.2 sa.spec
--- openpkg-src/sa/sa.spec 21 Feb 2005 17:08:25 -0000 1.33.2.1
+++ openpkg-src/sa/sa.spec 23 Jun 2005 13:58:33 -0000 1.33.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 1.2.4
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_ex no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
%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/shiela/shiela.spec
============================================================================
$ cvs diff -u -r1.45.2.1 -r1.45.2.2 shiela.spec
--- openpkg-src/shiela/shiela.spec 21 Feb 2005 17:08:32 -0000 1.45.2.1
+++ openpkg-src/shiela/shiela.spec 23 Jun 2005 13:58:33 -0000 1.45.2.2
@@ -34,7 +34,7 @@
Group: SCM
License: GPL
Version: 1.1.5
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/shiela/shiela-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, perl
-PreReq: OpenPKG, openpkg >= 2.3.0, perl, cvs, diffutils, xdelta,
sharutils, MTA
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, perl
+PreReq: OpenPKG, openpkg >= 2.3.3, perl, cvs, diffutils, xdelta,
sharutils, MTA
AutoReq: no
AutoReqProv: no
@@ -67,6 +67,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sio/sio.spec
============================================================================
$ cvs diff -u -r1.9.2.1 -r1.9.2.2 sio.spec
--- openpkg-src/sio/sio.spec 21 Feb 2005 17:08:33 -0000 1.9.2.1
+++ openpkg-src/sio/sio.spec 23 Jun 2005 13:58:34 -0000 1.9.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 0.9.2
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_ex no
@@ -48,8 +48,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
%if "%{with_ex}" == "yes"
BuildPreReq: ex
PreReq: ex
@@ -85,6 +85,7 @@
%prep
%setup -q
+ 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.20.2.1 -r1.20.2.2 snmpdx.spec
--- openpkg-src/snmpdx/snmpdx.spec 21 Feb 2005 17:08:35 -0000 1.20.2.1
+++ openpkg-src/snmpdx/snmpdx.spec 23 Jun 2005 13:58:34 -0000 1.20.2.2
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 0.2.10
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/tool/snmpdx/snmpdx-%{version}.tar.gz
@@ -43,8 +43,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0, perl, snmp
-PreReq: OpenPKG, openpkg >= 2.3.0, perl, snmp
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, perl, snmp
+PreReq: OpenPKG, openpkg >= 2.3.3, perl, snmp
AutoReq: no
AutoReqProv: no
@@ -64,6 +64,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
# configure program
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/str/str.spec
============================================================================
$ cvs diff -u -r1.30.2.1 -r1.30.2.2 str.spec
--- openpkg-src/str/str.spec 21 Feb 2005 17:08:40 -0000 1.30.2.1
+++ openpkg-src/str/str.spec 23 Jun 2005 13:58:34 -0000 1.30.2.2
@@ -34,7 +34,7 @@
Group: Text
License: MIT/BSD-style
Version: 0.9.10
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/lib/str/str-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -63,6 +63,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uuid/uuid.spec
============================================================================
$ cvs diff -u -r1.21.2.1 -r1.21.2.2 uuid.spec
--- openpkg-src/uuid/uuid.spec 21 Feb 2005 17:08:51 -0000 1.21.2.1
+++ openpkg-src/uuid/uuid.spec 23 Jun 2005 13:58:35 -0000 1.21.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 1.2.0
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_dce no
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
%if "%{with_perl}" == "yes"
BuildPreReq: perl
PreReq: perl
@@ -80,6 +80,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/val/val.spec
============================================================================
$ cvs diff -u -r1.16.2.1 -r1.16.2.2 val.spec
--- openpkg-src/val/val.spec 21 Feb 2005 17:08:52 -0000 1.16.2.1
+++ openpkg-src/val/val.spec 23 Jun 2005 13:58:35 -0000 1.16.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 0.9.3
-Release: 2.3.0
+Release: 2.3.1
# package options
%option with_ex no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
%if "%{with_ex}" == "yes"
BuildPreReq: ex
PreReq: ex
@@ -75,6 +75,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/var/var.spec
============================================================================
$ cvs diff -u -r1.17.2.1 -r1.17.2.2 var.spec
--- openpkg-src/var/var.spec 21 Feb 2005 17:08:52 -0000 1.17.2.1
+++ openpkg-src/var/var.spec 23 Jun 2005 13:58:35 -0000 1.17.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 1.1.2
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/lib/var/var-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -73,6 +73,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.spec
============================================================================
$ cvs diff -u -r1.39.2.1 -r1.39.2.2 wml.spec
--- openpkg-src/wml/wml.spec 21 Feb 2005 17:08:59 -0000 1.39.2.1
+++ openpkg-src/wml/wml.spec 23 Jun 2005 13:58:35 -0000 1.39.2.2
@@ -34,7 +34,7 @@
Group: Language
License: GPL
Version: 2.0.9
-Release: 2.3.0
+Release: 2.3.1
# 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 >= 2.3.0, perl, gcc
-PreReq: OpenPKG, openpkg >= 2.3.0, perl
+BuildPreReq: OpenPKG, openpkg >= 2.3.3, perl, gcc
+PreReq: OpenPKG, openpkg >= 2.3.3, perl
BuildPreReq: png, zlib
PreReq: png, zlib
AutoReq: no
@@ -83,6 +83,8 @@
%{l_shtool} subst \
-e 's;^\([ ]\{1,\}.LIBS.[ ]\{1,\}=>\).*$;\1 [\"-lm @LIBPNG@
%{l_ldflags} -lz\"],;' \
wml_common/gd/Makefile.PL.in
+ 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
+ %{l_shtool} subst -e 's;shtool guessos;shtool platform --type=gnu;g'
configure
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xds/xds.spec
============================================================================
$ cvs diff -u -r1.8.2.1 -r1.8.2.2 xds.spec
--- openpkg-src/xds/xds.spec 21 Feb 2005 17:09:01 -0000 1.8.2.1
+++ openpkg-src/xds/xds.spec 23 Jun 2005 13:58:36 -0000 1.8.2.2
@@ -34,7 +34,7 @@
Group: System
License: MIT/X11-style
Version: 0.9.1
-Release: 2.3.0
+Release: 2.3.1
# list of sources
Source0: ftp://ftp.ossp.org/pkg/lib/xds/xds-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.3.0
-PreReq: OpenPKG, openpkg >= 2.3.0
+BuildPreReq: OpenPKG, openpkg >= 2.3.3
+PreReq: OpenPKG, openpkg >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -66,6 +66,7 @@
%prep
%setup -q
+ cp %{l_shtool} .
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
