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: 03-Apr-2006 20:25:33
Branch: HEAD Handle: 2006040319253300
Modified files:
openpkg-src/gnupg gnupg.spec
Removed files:
openpkg-src/gnupg gnupg.patch
Log:
upgrading package: gnupg 1.4.2.2 -> 1.4.3
Summary:
Revision Changes Path
1.7 +0 -36 openpkg-src/gnupg/gnupg.patch
1.62 +17 -5 openpkg-src/gnupg/gnupg.spec
____________________________________________________________________________
rm -f openpkg-src/gnupg/gnupg.patch <<'@@ .'
Index: openpkg-src/gnupg/gnupg.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 gnupg.spec
--- openpkg-src/gnupg/gnupg.spec 9 Mar 2006 07:17:37 -0000 1.61
+++ openpkg-src/gnupg/gnupg.spec 3 Apr 2006 18:25:33 -0000 1.62
@@ -32,17 +32,17 @@
Class: BASE
Group: Cryptography
License: GPL
-Version: 1.4.2.2
-Release: 20060309
+Version: 1.4.3
+Release: 20060403
# package options
+%option with_curl no
%option with_idea no
%option with_ldap no
# list of sources
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.gz
Source1: ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz
-Patch0: gnupg.patch
# build information
Prefix: %{l_prefix}
@@ -51,6 +51,10 @@
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: zlib, bzip2, readline
PreReq: zlib, bzip2, readline
+%if "%{with_curl}" == "yes"
+BuildPreReq: curl, openssl
+PreReq: curl, openssl
+%endif
%if "%{with_ldap}" == "yes"
BuildPreReq: openldap, openssl
PreReq: openldap, openssl
@@ -75,7 +79,6 @@
%prep
%setup -q
- %patch -p0
%if "%{with_idea}" == "yes"
%{l_gzip} -d -c %{SOURCE idea.c.gz} >cipher/idea.c
%endif
@@ -87,9 +90,12 @@
rc=0; %{l_cc} -o dummy dummy.c -l$lib >/dev/null 2>&1 || rc=1
if [ $rc -eq 0 ]; then LIBS="$LIBS -l$lib"; break; fi
done
-%if "%{with_ldap}" == "yes"
+%if "%{with_ldap}" == "yes" || "%{with_curl}" == "yes"
LIBS="$LIBS -lssl -lcrypto"
%endif
+%if "%{with_curl}" == "yes"
+ LIBS="$LIBS -lz"
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -100,8 +106,14 @@
--with-zlib=%{l_prefix} \
--with-bzip2=%{l_prefix} \
--with-readline=%{l_prefix} \
+%if "%{with_curl}" == "yes"
+ --with-libcurl=%{l_prefix} \
+%else
+ --without-libcurl \
+%endif
--enable-exec \
--enable-keyserver-helpers \
+ --with-mailprog="%{l_prefix}/sbin/sendmail" \
%if "%{with_ldap}" == "yes"
--enable-ldap \
%else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
