OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jun-2003 23:01:30
Branch: HEAD Handle: 2003062322012801
Modified files:
openpkg-src/sasl sasl.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.78 +14 -10 openpkg-src/sasl/sasl.spec
1.4969 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.77 -r1.78 sasl.spec
--- openpkg-src/sasl/sasl.spec 30 May 2003 19:39:34 -0000 1.77
+++ openpkg-src/sasl/sasl.spec 23 Jun 2003 21:01:29 -0000 1.78
@@ -33,9 +33,10 @@
Group: Cryptography
License: BSD
Version: 2.1.13
-Release: 20030530
+Release: 20030623
# package options
+%option with_fsl yes
%option with_pam no
%option with_login no
%option with_ldap no
@@ -51,8 +52,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, db >= 4.1.24, fsl, gcc, openssl
-PreReq: OpenPKG, openpkg >= 20030103, db >= 4.1.24, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, db >= 4.1.24, gcc, openssl
+PreReq: OpenPKG, openpkg >= 20030415, db >= 4.1.24
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -103,8 +108,8 @@
# determine build flags
cflags="%{l_cflags -O} %{l_cppflags}"
- ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`"
- libs="-ldb `%{l_prefix}/bin/fsl-config --all --libs`"
+ ldflags="%{l_ldflags} %{l_fsl_ldflags}"
+ libs="-ldb %{l_fsl_libs}"
%if "%{with_ldap}" == "yes"
cflags="$cflags -DAUTH_LDAP"
%endif
@@ -247,19 +252,18 @@
%{SOURCE rc.sasl} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # install OSSP fsl configuration
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ # OSSP fake syslog library
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE fsl.sasl} \
+ %{SOURCE fsl.%{name}} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/fsl/fsl.sasl' \
'%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
'%config %{l_prefix}/etc/sasl/saslauthd.conf' \
'%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
'%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl/saslauthd' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4968 -r1.4969 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:01:18 -0000 1.4968
+++ openpkg-web/news.txt 23 Jun 2003 21:01:28 -0000 1.4969
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<sasl-2.1.13-20030623>
23-Jun-2003: Upgraded package: P<qpopper-4.0.5-20030623>
23-Jun-2003: Upgraded package: P<powerdns-2.9.8-20030623>
23-Jun-2003: Upgraded package: P<pound-1.4-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
