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:48:05
Branch: HEAD Handle: 2003062321480302
Modified files:
openpkg-src/inn inn.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.62 +16 -9 openpkg-src/inn/inn.spec
1.4959 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 inn.spec
--- openpkg-src/inn/inn.spec 27 May 2003 19:52:55 -0000 1.61
+++ openpkg-src/inn/inn.spec 23 Jun 2003 20:48:05 -0000 1.62
@@ -33,7 +33,10 @@
Group: News
License: ISC
Version: 2.4.0
-Release: 20030527
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -44,8 +47,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, gzip, make, perl, db, openssl,
bison, flex
-PreReq: OpenPKG, openpkg >= 20020206, fsl, gzip, perl, MTA
+BuildPreReq: OpenPKG, openpkg >= 20030415, gzip, make, perl, db, openssl, bison,
flex
+PreReq: OpenPKG, openpkg >= 20030415, gzip, perl, MTA
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -73,8 +80,8 @@
# configure the source tree
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} %{l_cppflags}" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --all`" \
- LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--bindir=%{l_prefix}/libexec/inn \
@@ -176,11 +183,11 @@
%{SOURCE rc.inn} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # OSSP fsl support
+ # 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.inn} \
+ %{SOURCE fsl.%{name}} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
# strip binaries
@@ -194,9 +201,9 @@
# determine file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/inn/*' \
- '%config %{l_prefix}/etc/fsl/fsl.inn' \
'%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
+ '%config %{l_prefix}/etc/inn/*' \
'%attr(4550,root,%{l_mgrp}) %{l_prefix}/bin/rnews' \
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/inn/inndstart' \
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/inn/startinnfeed' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4958 -r1.4959 news.txt
--- openpkg-web/news.txt 23 Jun 2003 20:47:54 -0000 1.4958
+++ openpkg-web/news.txt 23 Jun 2003 20:48:03 -0000 1.4959
@@ -1,3 +1,4 @@
+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>
23-Jun-2003: Upgraded package: P<arpd-0.2-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
