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 22:50:46
Branch: HEAD Handle: 2003062321504401
Modified files:
openpkg-src/nsd nsd.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.4 +16 -7 openpkg-src/nsd/nsd.spec
1.4960 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/nsd.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 nsd.spec
--- openpkg-src/nsd/nsd.spec 16 Apr 2003 08:27:08 -0000 1.3
+++ openpkg-src/nsd/nsd.spec 23 Jun 2003 20:50:45 -0000 1.4
@@ -25,6 +25,7 @@
# FIXME rse: optional AXFR support via BIND8 named-xfer?
# FIXME rse: optional libwrap support via {tcp,socket}_wrappers for AXFR
+# FIXME thl: libwrap can be (mis-)used for fsl, but the right side of the
assignment must never be empty. this requires an "if"
# package information
Name: nsd
@@ -36,7 +37,7 @@
Group: DNS
License: GPL
Version: 1.1.0b
-Release: 20030416
+Release: 20030623
# package option
%option with_fsl yes
@@ -52,8 +53,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030415, fsl, make
-PreReq: OpenPKG, openpkg >= 20030415, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, make
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -82,7 +87,9 @@
--with-dbfile=%{l_prefix}/var/nsd/nsd.db \
--with-user="%{l_ruid}.%{l_rgid}" \
--with-namedxfer=%{l_prefix}/libexec/bind/named-xfer \
+%if "%{with_fsl}" == "yes"
--with-libwrap="%{l_fsl_ldflags} %{l_fsl_libs}" \
+%endif
--enable-bind8-stats \
--disable-shared \
--disable-nls
@@ -96,7 +103,6 @@
# pre-create installation hierarchy
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/etc/nsd/nsd.db \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
@@ -133,10 +139,12 @@
-e 's;@l_susr@;%{l_susr};g' \
%{SOURCE rc.nsd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # install fsl configuration file
+ # 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.nsd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
# strip installation
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
@@ -144,9 +152,10 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
'%config %{l_prefix}/etc/nsd/*' \
'%not %dir %{l_prefix}/etc/rc.d' \
- '%not %dir %{l_prefix}/etc/fsl' \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/nsd'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4959 -r1.4960 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:48:03 -0000 1.4959
+++ openpkg-web/news.txt 23 Jun 2003 20:50:44 -0000 1.4960
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<nsd-1.1.0b-20030623>
23-Jun-2003: Upgraded package: P<inn-2.4.0-20030623>
23-Jun-2003: Upgraded package: P<imapd-2.1.13-20030623>
23-Jun-2003: Upgraded package: P<honeyd-0.5a-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
