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:47:45
Branch: HEAD Handle: 2003062321474401
Modified files:
openpkg-src/honeyd honeyd.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.11 +21 -7 openpkg-src/honeyd/honeyd.spec
1.4957 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 5 May 2003 07:10:37 -0000 1.10
+++ openpkg-src/honeyd/honeyd.spec 23 Jun 2003 20:47:45 -0000 1.11
@@ -33,7 +33,10 @@
Group: Language
License: BSD License
Version: 0.5a
-Release: 20030505
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: http://niels.xtdnet.nl/honeyd/honeyd-%{version}.tar.gz
@@ -44,8 +47,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030211, fsl, libdnet, libpcap, libevent
-PreReq: OpenPKG, openpkg >= 20030211, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, libdnet, libpcap, libevent
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -76,7 +83,7 @@
--with-libpcap=%{l_prefix} \
--with-libevent=%{l_prefix}
%{l_shtool} subst \
- -e "s;^\\(honeyd_LDADD.*\\)$;\\1 `%{l_prefix}/bin/fsl-config --all
--ldflags --libs`;" \
+ -e "s;^\\(honeyd_LDADD.*\\)$;\\1 %{l_fsl_ldflags} %{l_fsl_libs};" \
Makefile
%{l_make} %{l_mflags}
@@ -85,7 +92,6 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/honeyd \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
$RPM_BUILD_ROOT%{l_prefix}/lib/honeyd \
@@ -115,10 +121,18 @@
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' \
%{SOURCE rc.honeyd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # 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.honeyd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ %{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}'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4956 -r1.4957 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:47:36 -0000 1.4956
+++ openpkg-web/news.txt 23 Jun 2003 20:47:44 -0000 1.4957
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<honeyd-0.5a-20030623>
23-Jun-2003: Upgraded package: P<arpd-0.2-20030623>
23-Jun-2003: Upgraded package: P<libiconv-1.9.1-20030623>
23-Jun-2003: Upgraded package: P<perl-dbi-20030623-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
