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 openpkg-web Date: 30-Dec-2002 20:54:11
Branch: HEAD Handle: 2002123019541000
Modified files:
openpkg-src/sasl sasl.spec
openpkg-web news.txt
Log:
switch to %option(s) and modernize flags
Summary:
Revision Changes Path
1.42 +13 -15 openpkg-src/sasl/sasl.spec
1.2455 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 sasl.spec
--- openpkg-src/sasl/sasl.spec 9 Dec 2002 22:26:41 -0000 1.41
+++ openpkg-src/sasl/sasl.spec 30 Dec 2002 19:54:10 -0000 1.42
@@ -24,12 +24,8 @@
##
# package options
-%ifndef with_fsl
-%define with_fsl no
-%endif
-%ifndef with_pam
-%define with_pam no
-%endif
+%option with_fsl no
+%option with_pam no
# package information
Name: sasl
@@ -41,7 +37,7 @@
Group: Cryptography
License: BSD
Version: 2.1.10
-Release: 20021209
+Release: 20021230
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -51,12 +47,16 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, db >= 4.1.24, openssl, gcc
+BuildPreReq: OpenPKG, openpkg >= 20021230, db >= 4.1.24, openssl, gcc
+PreReq: OpenPKG, openpkg >= 20021230
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl
PreReq: fsl
%endif
-PreReq: OpenPKG, openpkg >= 20020206
+%if "%{with_pam}" == "yes"
+BuildPreReq: PAM
+PreReq: PAM
+%endif
AutoReq: no
AutoReqProv: no
@@ -69,9 +69,7 @@
negotiated, a security layer is inserted between the protocol and
the connection.
- Options:
- --define 'with_fsl %{with_fsl}'
- --define 'with_pam %{with_pam}'
+ %options
%prep
%setup -q -n cyrus-sasl-%{version}
@@ -86,12 +84,12 @@
-e "s;javadoc;javadoc-xxx;g" \
configure
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags}" \
%if "%{with_fsl}" == "yes"
- LDFLAGS="-L%{l_prefix}/lib `%{l_prefix}/bin/fsl-config --all --ldflags`" \
+ LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
LIBS="-ldb `%{l_prefix}/bin/fsl-config --all --libs`" \
%else
- LDFLAGS="-L%{l_prefix}/lib" \
+ LDFLAGS="%{l_ldflags}" \
LIBS="-ldb" \
%endif
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2454 -r1.2455 news.txt
--- openpkg-web/news.txt 30 Dec 2002 19:53:52 -0000 1.2454
+++ openpkg-web/news.txt 30 Dec 2002 19:54:10 -0000 1.2455
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<sasl-2.1.10-20021230>
30-Dec-2002: Upgraded package: P<spegla-1.1p4-20021230>
30-Dec-2002: Upgraded package: P<samba-2.2.7a-20021230>
30-Dec-2002: Upgraded package: P<sa-1.0.2-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
