OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Dec-2004 21:46:38
Branch: HEAD Handle: 2004121620463700
Modified files:
openpkg-src/gnupg gnupg.spec
Log:
cleanup packaging: zlib deps occured twice, add LDAP support, enable
keyserver helpers, remove no longer existing options, etc.
Summary:
Revision Changes Path
1.49 +25 -8 openpkg-src/gnupg/gnupg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 gnupg.spec
--- openpkg-src/gnupg/gnupg.spec 16 Dec 2004 19:09:12 -0000 1.48
+++ openpkg-src/gnupg/gnupg.spec 16 Dec 2004 20:46:37 -0000 1.49
@@ -38,6 +38,7 @@
# package options
%option with_idea no
+%option with_ldap no
# list of sources
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.gz
@@ -46,10 +47,14 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, zlib, bzip2, make
-PreReq: OpenPKG, openpkg >= 20040130, zlib, bzip2
-BuildPreReq: zlib
-PreReq: zlib
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: zlib, bzip2, readline
+PreReq: zlib, bzip2, readline
+%if "%{with_ldap}" == "yes"
+BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
+%endif
AutoReq: no
AutoReqProv: no
@@ -79,20 +84,32 @@
echo "int main(int argc, char *argv[]) { return 0; }" >dummy.c
for lib in termcap termlib curses ncurses; do
rc=0; %{l_cc} -o dummy dummy.c -l$lib >/dev/null 2>&1 || rc=1
- if [ $rc -eq 0 ]; then LIBS="-l$lib"; break; fi
+ if [ $rc -eq 0 ]; then LIBS="$LIBS -l$lib"; break; fi
done
+%if "%{with_ldap}" == "yes"
+ LIBS="$LIBS -lssl -lcrypto"
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
LIBS="$LIBS" \
./configure \
--prefix=%{l_prefix} \
--with-zlib=%{l_prefix} \
--with-bzip2=%{l_prefix} \
- --with-included-gettext \
+ --enable-exec \
+ --enable-keyserver-helpers \
+%if "%{with_ldap}" == "yes"
+ --enable-ldap \
+%else
+ --disable-ldap \
+%endif
+ --enable-finger \
+ --enable-http \
+ --enable-hkp \
--disable-mailto \
- --disable-exec \
- --disable-dynload \
+ --with-included-gettext \
--disable-nls
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
