OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 11-Sep-2002 16:26:17
Branch: HEAD Handle: 2002091115261601
Modified files:
openpkg-src/inn inn.spec
openpkg-web news.txt
Log:
OSSP fsl logic is hard coded into buildconf and no longer conditional.
Summary:
Revision Changes Path
1.45 +7 -43 openpkg-src/inn/inn.spec
1.1525 +2 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/inn/inn.spec
============================================================
$ cvs diff -u -r1.44 -r1.45 inn.spec
--- openpkg-src/inn/inn.spec 26 Aug 2002 09:39:34 -0000 1.44
+++ openpkg-src/inn/inn.spec 11 Sep 2002 14:26:17 -0000 1.45
@@ -27,11 +27,6 @@
%define V_inn 2.3.3
%define V_cleanfeed 20010805
-# package options
-%ifndef with_fsl
-%define with_fsl no
-%endif
-
# package information
Name: inn
Summary: InterNetNews Usenet Server
@@ -42,24 +37,19 @@
Group: News
License: ISC
Version: %{V_inn}
-Release: 20020801
+Release: 20020911
# list of sources
Source0: ftp://ftp.isc.org/isc/inn/inn-%{V_inn}.tar.gz
Source1: http://www.bofh.it/~md/cleanfeed/cleanfeed-%{V_cleanfeed}.tgz
-Source2: ftp://ftp.openpkg.org/DST/inn/fakesyslog.tar.gz
-Source3: rc.inn
-Source4: fsl.inn
+Source2: rc.inn
+Source3: fsl.inn
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, perl, db3, openssl, bison, flex
-PreReq: OpenPKG, openpkg >= 20020206, perl, perl-crypto, MTA
-%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl
-PreReq: fsl
-%endif
+BuildPreReq: OpenPKG, openpkg >= 20020206, fsl, make, perl, db3, openssl, bison,
flex
+PreReq: OpenPKG, openpkg >= 20020206, fsl, perl, perl-crypto, MTA
AutoReq: no
AutoReqProv: no
@@ -68,29 +58,12 @@
NNTP server, and nnrpd, a newsreading server. INN separates hosts
that feed you news from those that have users reading news.
- Options
- with_fsl=%{with_fsl}
-
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
-%if "%{with_fsl}" != "yes"
- %setup2 -q -T -D -a 2
-%endif
%build
- # build faked syslog(3) library
-%if "%{with_fsl}" != "yes"
- fakesyslogdir="`pwd`/fakesyslog"
- ( cd fakesyslog
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --with-logfile=%{l_prefix}/var/inn/log/news.log
- %{l_make} %{l_mflags}
- )
-%endif
-
+ # build inn
cd inn-%{V_inn}
# adjust some too strange INN paths
@@ -111,13 +84,8 @@
# configure the source tree
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} -I%{l_prefix}/include/db3 -I%{l_prefix}/include" \
-%if "%{with_fsl}" == "yes"
LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags --all`" \
LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \
-%else
- LDFLAGS="-L$fakesyslogdir -L%{l_prefix}/lib" \
- LIBS="-lfakesyslog" \
-%endif
./configure \
--prefix=%{l_prefix} \
--bindir=%{l_prefix}/libexec/inn \
@@ -223,14 +191,12 @@
%{SOURCE rc.inn} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # optional OSSP fsl support
-%if "%{with_fsl}" == "yes"
+ # OSSP fsl support
%{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} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-%endif
)
# install cleanfeed
@@ -261,10 +227,8 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/inn/*' \
-%if "%{with_fsl}" == "yes"
'%config %{l_prefix}/etc/fsl/fsl.inn' \
'%not %dir %{l_prefix}/etc/fsl' \
-%endif
'%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' \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1524 -r1.1525 news.txt
--- openpkg-web/news.txt 11 Sep 2002 12:45:52 -0000 1.1524
+++ openpkg-web/news.txt 11 Sep 2002 14:26:16 -0000 1.1525
@@ -1,3 +1,5 @@
+11-Sep-2002: Upgraded package: P<inn-2.3.3-20020911>
+11-Sep-2002: Upgraded package: P<openssh-3.4p1-20020911>
11-Sep-2002: Upgraded package: P<smtpfeed-1.18-20020911>
11-Sep-2002: Upgraded package: P<petidomo-4.0b1-20020911>
11-Sep-2002: Upgraded package: P<qpopper-4.0.4-20020911>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
