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: 22-Dec-2006 22:09:18
Branch: OPENPKG_2_STABLE Handle: 200612021540221747736
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache2 apache2.spec
openpkg-src/apr apr.spec
openpkg-src/c2man c2man.spec
openpkg-src/devtodo devtodo.spec
openpkg-src/di di.spec
openpkg-src/docbook docbook.spec
openpkg-src/doxygen doxygen.spec
openpkg-src/enscript enscript.spec
openpkg-src/exim exim.spec
openpkg-src/global global.spec
openpkg-src/glpk glpk.spec
openpkg-src/gnutls gnutls.spec
openpkg-src/iozone iozone.spec
openpkg-src/libtasn1 libtasn1.spec
openpkg-src/lynx lynx.spec
openpkg-src/mhash mhash.spec
openpkg-src/opencdk opencdk.spec
Removed files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apr apr.patch
Log:
MFC: make up leeway for 2_STABLE by virtue of build-time results
Summary:
Revision Changes Path
1.74.2.4 +2 -2 openpkg-src/apache2/apache2.spec
1.5 +0 -56 openpkg-src/apr/apr.patch
1.31.2.3 +2 -4 openpkg-src/apr/apr.spec
1.25.2.3 +2 -3 openpkg-src/c2man/c2man.spec
1.29.2.3 +2 -2 openpkg-src/devtodo/devtodo.spec
1.31.2.3 +2 -2 openpkg-src/di/di.spec
1.89.2.3 +2 -2 openpkg-src/docbook/docbook.spec
1.52.2.3 +3 -3 openpkg-src/doxygen/doxygen.spec
1.10.2.3 +3 -2 openpkg-src/enscript/enscript.spec
1.98.2.3 +2 -2 openpkg-src/exim/exim.spec
1.22.2.3 +2 -2 openpkg-src/global/global.spec
1.18.2.3 +2 -3 openpkg-src/glpk/glpk.spec
1.77.2.4 +27 -8 openpkg-src/gnutls/gnutls.spec
1.123.2.3 +3 -3 openpkg-src/iozone/iozone.spec
1.42.2.3 +4 -2 openpkg-src/libtasn1/libtasn1.spec
1.37.2.4 +20 -3 openpkg-src/lynx/lynx.spec
1.25.2.3 +2 -2 openpkg-src/mhash/mhash.spec
1.28.2.3 +2 -2 openpkg-src/opencdk/opencdk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.74.2.3 -r1.74.2.4 apache2.spec
--- openpkg-src/apache2/apache2.spec 16 Oct 2006 14:47:41 -0000 1.74.2.3
+++ openpkg-src/apache2/apache2.spec 22 Dec 2006 21:09:12 -0000 1.74.2.4
@@ -26,7 +26,7 @@
# package version
%define V_apache 2.2.3
-%define V_mod_perl 2.0.2
+%define V_mod_perl 2.0.3
# package information
Name: apache2
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.20061018
+Release: 2.20061222
# package options (generic)
%option with_mpm prefork
@@ .
rm -f openpkg-src/apr/apr.patch <<'@@ .'
Index: openpkg-src/apr/apr.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.31.2.2 -r1.31.2.3 apr.spec
--- openpkg-src/apr/apr.spec 16 Oct 2006 14:47:47 -0000 1.31.2.2
+++ openpkg-src/apr/apr.spec 22 Dec 2006 21:09:11 -0000 1.31.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: Libraries
License: Apache
-Version: 1.2.7
-Release: 2.20061018
+Version: 1.2.8
+Release: 2.20061222
# package options
%option with_threads no
@@ -41,7 +41,6 @@
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
Source1: http://www.apache.org/dist/apr/apr-util-%{version}.tar.gz
-Patch0: apr.patch
# build information
Prefix: %{l_prefix}
@@ -74,7 +73,6 @@
%prep
%setup -q -c
%setup -q -D -T -a 1
- %patch -p0
%build
( cd apr-%{version}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/c2man/c2man.spec
============================================================================
$ cvs diff -u -r1.25.2.2 -r1.25.2.3 c2man.spec
--- openpkg-src/c2man/c2man.spec 16 Oct 2006 14:48:48 -0000 1.25.2.2
+++ openpkg-src/c2man/c2man.spec 22 Dec 2006 21:09:12 -0000 1.25.2.3
@@ -37,7 +37,7 @@
Group: Development
License: GPL
Version: %{V_here}
-Release: 2.20061018
+Release: 2.20061222
# list of sources
Source0:
ftp://ftp.research.canon.com.au/pub/misc/c2man/c2man-%{V_real}.tar.gz
@@ -62,10 +62,9 @@
%track
prog c2man = {
- comment = "thl: ftp server is very slow; curl cannot connect at
all"
version = %{V_real}
url = ftp://ftp.research.canon.com.au/pub/misc/c2man/
- regex = c2man-([EMAIL PROTECTED])\.tar\.gz
+ regex = c2man-([EMAIL PROTECTED])\.tar\.gz
}
%prep
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/devtodo/devtodo.spec
============================================================================
$ cvs diff -u -r1.29.2.2 -r1.29.2.3 devtodo.spec
--- openpkg-src/devtodo/devtodo.spec 16 Oct 2006 14:49:25 -0000 1.29.2.2
+++ openpkg-src/devtodo/devtodo.spec 22 Dec 2006 21:09:12 -0000 1.29.2.3
@@ -30,10 +30,10 @@
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: PLUS
-Group: Text
+Group: Terminal
License: GPL
Version: 0.1.19
-Release: 2.20061018
+Release: 2.20061222
# list of sources
Source0: http://swapoff.org/files/devtodo/devtodo-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/di/di.spec
============================================================================
$ cvs diff -u -r1.31.2.2 -r1.31.2.3 di.spec
--- openpkg-src/di/di.spec 16 Oct 2006 14:49:28 -0000 1.31.2.2
+++ openpkg-src/di/di.spec 22 Dec 2006 21:09:13 -0000 1.31.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: ShellUtils
License: MIT-style
-Version: 4.8
-Release: 2.20061018
+Version: 4.9
+Release: 2.20061222
# list of sources
Source0: http://www.gentoo.com/di/di-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/docbook/docbook.spec
============================================================================
$ cvs diff -u -r1.89.2.2 -r1.89.2.3 docbook.spec
--- openpkg-src/docbook/docbook.spec 16 Oct 2006 14:49:37 -0000 1.89.2.2
+++ openpkg-src/docbook/docbook.spec 22 Dec 2006 21:09:13 -0000 1.89.2.3
@@ -32,7 +32,7 @@
%define V_dtd_xml_old_n 412
%define V_dtd_simple 1.0
%define V_ss_dsssl 1.79
-%define V_ss_xsl 1.71.0
+%define V_ss_xsl 1.71.1
# package information
Name: docbook
@@ -45,7 +45,7 @@
Group: XML
License: BSD
Version: 4.2
-Release: 2.20061018
+Release: 2.20061222
# list of sources
Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.spec
============================================================================
$ cvs diff -u -r1.52.2.2 -r1.52.2.3 doxygen.spec
--- openpkg-src/doxygen/doxygen.spec 16 Oct 2006 14:49:39 -0000 1.52.2.2
+++ openpkg-src/doxygen/doxygen.spec 22 Dec 2006 21:09:14 -0000 1.52.2.3
@@ -25,15 +25,15 @@
# package information
Name: doxygen
Summary: Source Code Documentation Extraction Tool
-URL: http://www.stack.nl/~dimitri/doxygen/
+URL: http://www.doxygen.org/
Vendor: Dimitri van Heesch
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: PLUS
Group: Development
License: GPL
-Version: 1.4.7
-Release: 2.20061018
+Version: 1.5.1
+Release: 2.20061222
# list of sources
Source0:
ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/enscript/enscript.spec
============================================================================
$ cvs diff -u -r1.10.2.2 -r1.10.2.3 enscript.spec
--- openpkg-src/enscript/enscript.spec 16 Oct 2006 14:49:50 -0000
1.10.2.2
+++ openpkg-src/enscript/enscript.spec 22 Dec 2006 21:09:15 -0000
1.10.2.3
@@ -33,7 +33,7 @@
Group: Postscript
License: GPL
Version: 1.6.3
-Release: 2.20061018
+Release: 2.20061222
# list of sources
Source0:
http://www.codento.com/people/mtr/genscript/enscript-%{version}.tar.gz
@@ -57,10 +57,11 @@
%track
prog enscript = {
+ disabled
comment = "rse: 1.6.4 is beta and slightly broken"
version = %{version}
url = http://www.codento.com/people/mtr/genscript/
- regex = enscript-(\d+\.6\.[5-9]|\d+\.[7-9]\.\d+)\.tar\.gz
+ regex = enscript-(\d+\.6\.[1-35-9]|\d+\.[7-9]\.\d+)\.tar\.gz
}
%prep
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.spec
============================================================================
$ cvs diff -u -r1.98.2.2 -r1.98.2.3 exim.spec
--- openpkg-src/exim/exim.spec 16 Oct 2006 14:49:52 -0000 1.98.2.2
+++ openpkg-src/exim/exim.spec 22 Dec 2006 21:09:15 -0000 1.98.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 4.63
-Release: 2.20061018
+Version: 4.64
+Release: 2.20061222
# package options
%option with_auth_cram_md5 no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/global/global.spec
============================================================================
$ cvs diff -u -r1.22.2.2 -r1.22.2.3 global.spec
--- openpkg-src/global/global.spec 16 Oct 2006 14:50:33 -0000 1.22.2.2
+++ openpkg-src/global/global.spec 22 Dec 2006 21:09:15 -0000 1.22.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: Development
License: GPL
-Version: 5.2
-Release: 2.20061018
+Version: 5.3
+Release: 2.20061222
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/global/global-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glpk/glpk.spec
============================================================================
$ cvs diff -u -r1.18.2.2 -r1.18.2.3 glpk.spec
--- openpkg-src/glpk/glpk.spec 16 Oct 2006 14:50:33 -0000 1.18.2.2
+++ openpkg-src/glpk/glpk.spec 22 Dec 2006 21:09:16 -0000 1.18.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: Algorithm
License: GPL
-Version: 4.11
-Release: 2.20061018
+Version: 4.13
+Release: 2.20061222
# list of sources
Source0: ftp://ftp.gnu.org/gnu/glpk/glpk-%{version}.tar.gz
@@ -67,7 +67,6 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
- LIBS="-lm" \
./configure \
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/glpk
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnutls/gnutls.spec
============================================================================
$ cvs diff -u -r1.77.2.3 -r1.77.2.4 gnutls.spec
--- openpkg-src/gnutls/gnutls.spec 24 Oct 2006 07:24:26 -0000 1.77.2.3
+++ openpkg-src/gnutls/gnutls.spec 22 Dec 2006 21:09:17 -0000 1.77.2.4
@@ -32,20 +32,27 @@
Class: PLUS
Group: SSL
License: GPL
-Version: 1.4.4
-Release: 2.20061024
+Version: 1.6.0
+Release: 2.20061222
+
+# package options
+%option with_cxx no
# list of sources
-Source0: ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-%{version}.tar.bz2
+Source0:
ftp://ftp.gnutls.org/pub/crypto/gnutls/gnutls-%{version}.tar.bz2
Patch0: gnutls.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.20061018, gcc
+BuildPreReq: OpenPKG, openpkg >= 2.20061018
PreReq: OpenPKG, openpkg >= 2.20061018
-BuildPreReq: gcrypt >= 1.2.2, opencdk >= 0.5.2, libtasn1, lzo, zlib, getopt
-PreReq: gcrypt >= 1.2.2, opencdk >= 0.5.2, libtasn1, lzo, zlib, getopt
+BuildPreReq: gcc
+%if "%{with_cxx}" == "yes"
+BuildPreReq: gcc::with_cxx = yes
+%endif
+BuildPreReq: gcrypt >= 1.2.2, opencdk >= 0.5.5, libtasn1 >= 0.3.4, lzo,
zlib, getopt
+PreReq: gcrypt >= 1.2.2, opencdk >= 0.5.5, libtasn1 >= 0.3.4, lzo,
zlib, getopt
AutoReq: no
AutoReqProv: no
@@ -58,7 +65,7 @@
%track
prog gnutls = {
version = %{version}
- url = ftp://ftp.gnupg.org/gcrypt/gnutls/
+ url = ftp://ftp.gnutls.org/pub/crypto/gnutls/
regex = gnutls-(__VER__)\.tar\.bz2
}
@@ -73,7 +80,11 @@
esac
echo 'ac_cv_type_ptrdiff_t=yes' >config.cache
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} %{l_cppflags lzo}" \
+ CFLAGS="%{l_cflags -O}" \
+%if "%{with_cxx}" == "yes"
+ CXX="%{l_cxx}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+%endif
CPPFLAGS="%{l_cppflags} %{l_cppflags lzo}" \
LDFLAGS="%{l_ldflags}" \
LIBS="$libs -lgetopt `%{l_prefix}/bin/gpg-error-config --libs`" \
@@ -81,10 +92,17 @@
./configure \
--cache-file=config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
--with-libgcrypt-prefix=%{l_prefix} \
--with-libopencdk-prefix=%{l_prefix} \
--with-zlib \
--with-lzo \
+%if "%{with_cxx}" == "yes"
+ --enable-cxx \
+%else
+ --disable-cxx \
+%endif
--without-included-lzo \
--disable-shared
%{l_make} %{l_mflags -O}
@@ -94,6 +112,7 @@
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/share/aclocal'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/iozone/iozone.spec
============================================================================
$ cvs diff -u -r1.123.2.2 -r1.123.2.3 iozone.spec
--- openpkg-src/iozone/iozone.spec 16 Oct 2006 14:51:18 -0000
1.123.2.2
+++ openpkg-src/iozone/iozone.spec 22 Dec 2006 21:09:17 -0000
1.123.2.3
@@ -23,8 +23,8 @@
##
# package version
-%define V_logic 3.263
-%define V_real 3_263
+%define V_logic 3.279
+%define V_real 3_279
# package information
Name: iozone
@@ -37,7 +37,7 @@
Group: Benchmark
License: Open Source
Version: %{V_logic}
-Release: 2.20061018
+Release: 2.20061222
# list of sources
Source0: http://www.iozone.org/src/current/iozone%{V_real}.tar
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libtasn1/libtasn1.spec
============================================================================
$ cvs diff -u -r1.42.2.2 -r1.42.2.3 libtasn1.spec
--- openpkg-src/libtasn1/libtasn1.spec 16 Oct 2006 14:52:07 -0000
1.42.2.2
+++ openpkg-src/libtasn1/libtasn1.spec 22 Dec 2006 21:09:16 -0000
1.42.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: Libraries
License: LGPL
-Version: 0.3.6
-Release: 2.20061018
+Version: 0.3.8
+Release: 2.20061222
# list of sources
Source0:
ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/libtasn1-%{version}.tar.gz
@@ -66,6 +66,8 @@
GREP="grep" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
--disable-shared
%{l_make} %{l_mflags -O}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lynx/lynx.spec
============================================================================
$ cvs diff -u -r1.37.2.3 -r1.37.2.4 lynx.spec
--- openpkg-src/lynx/lynx.spec 22 Oct 2006 09:02:11 -0000 1.37.2.3
+++ openpkg-src/lynx/lynx.spec 22 Dec 2006 21:09:17 -0000 1.37.2.4
@@ -38,7 +38,11 @@
Group: Web
License: GPL
Version: %{V_opkg}
-Release: 2.20061022
+Release: 2.20061222
+
+# package options
+%option with_ssl yes
+%option with_cgi no
# list of sources
Source0: http://lynx.isc.org/release/lynx%{V_dist}.tar.bz2
@@ -48,8 +52,12 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 2.20061018, make
PreReq: OpenPKG, openpkg >= 2.20061018
-BuildPreReq: slang >= 2.0, zlib, bzip2, openssl
-PreReq: slang >= 2.0, zlib, bzip2, openssl
+BuildPreReq: slang >= 2.0, zlib, bzip2
+PreReq: slang >= 2.0, zlib, bzip2
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
AutoReq: no
AutoReqProv: no
@@ -79,7 +87,16 @@
--disable-trace \
--disable-nls \
--with-screen=slang \
+%if "%{with_ssl}" == "yes"
--with-ssl=%{l_prefix} \
+%else
+ --without-ssl \
+%endif
+%if "%{with_cgi}" == "yes"
+ --enable-cgi-links \
+%else
+ --disable-cgi-links \
+%endif
--enable-default-colors \
--enable-prettysrc \
--enable-read-eta \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mhash/mhash.spec
============================================================================
$ cvs diff -u -r1.25.2.2 -r1.25.2.3 mhash.spec
--- openpkg-src/mhash/mhash.spec 16 Oct 2006 14:52:45 -0000 1.25.2.2
+++ openpkg-src/mhash/mhash.spec 22 Dec 2006 21:09:18 -0000 1.25.2.3
@@ -24,7 +24,7 @@
# package information
Name: mhash
-Summary: Thread-safe hash library
+Summary: Thread-Safe Hashing Library
URL: http://mhash.sf.net/
Vendor: Nikos Mavroyanopoulos
Packager: OpenPKG Foundation e.V.
@@ -33,7 +33,7 @@
Group: Cryptography
License: LGPL
Version: 0.9.7.1
-Release: 2.20061018
+Release: 2.20061222
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/mhash/mhash-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/opencdk/opencdk.spec
============================================================================
$ cvs diff -u -r1.28.2.2 -r1.28.2.3 opencdk.spec
--- openpkg-src/opencdk/opencdk.spec 16 Oct 2006 14:53:31 -0000 1.28.2.2
+++ openpkg-src/opencdk/opencdk.spec 22 Dec 2006 21:09:16 -0000 1.28.2.3
@@ -32,8 +32,8 @@
Class: PLUS
Group: Cryptography
License: GPL
-Version: 0.5.10
-Release: 2.20061018
+Version: 0.5.11
+Release: 2.20061222
# list of sources
Source0:
ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/opencdk-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
