OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Nov-2006 22:32:48
Branch: HEAD Handle: 2006111721324700
Modified files:
openpkg-src/gnutls gnutls.spec
Log:
upgrading package: gnutls 1.4.5 -> 1.6.0
Summary:
Revision Changes Path
1.85 +24 -8 openpkg-src/gnutls/gnutls.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnutls/gnutls.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 gnutls.spec
--- openpkg-src/gnutls/gnutls.spec 10 Nov 2006 21:38:04 -0000 1.84
+++ openpkg-src/gnutls/gnutls.spec 17 Nov 2006 21:32:47 -0000 1.85
@@ -32,20 +32,27 @@
Class: PLUS
Group: SSL
License: GPL
-Version: 1.4.5
-Release: 20061110
+Version: 1.6.0
+Release: 20061117
+
+# 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 >= 20040130, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
-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`" \
@@ -87,6 +98,11 @@
--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}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
