OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Sep-2002 18:17:08
Branch: HEAD Handle: 2002090917170800
Added files:
openpkg-src/smtpfeed fsl.smtpfeed
Modified files:
openpkg-src/smtpfeed smtpfeed.spec
Log:
Remove old fakesyslog logic, and include new fsl dependency and build logic.
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/smtpfeed/fsl.smtpfeed
1.29 +19 -21 openpkg-src/smtpfeed/smtpfeed.spec
____________________________________________________________________________
Index: openpkg-src/smtpfeed/fsl.smtpfeed
============================================================
$ cvs update -p -r1.1 fsl.smtpfeed
##
## fsl.smtpfeed -- OSSP fsl configuration for SMTPFeed
##
ident (smtpfeed/.+)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
-> {
debug: file(
path="@l_prefix@/var/smtpfeed/smtpfeed.log",
append=1, perm=0644
)
}
}
Index: openpkg-src/smtpfeed/smtpfeed.spec
============================================================
$ cvs diff -u -r1.28 -r1.29 smtpfeed.spec
--- openpkg-src/smtpfeed/smtpfeed.spec 13 Aug 2002 12:49:59 -0000 1.28
+++ openpkg-src/smtpfeed/smtpfeed.spec 9 Sep 2002 16:17:08 -0000 1.29
@@ -33,19 +33,19 @@
Group: Mail
License: GPL
Version: 1.18
-Release: 20020319
+Release: 20020909
# list of sources
Source0:
ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/smtpfeed-%{version}.tar.gz
Source1: smtpfeedd.tar.gz
-Source2: fakesyslog.tar.gz
-Source3: rc.smtpfeed
+Source2: rc.smtpfeed
+Source3: fsl.smtpfeed
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20020206, fsl
+PreReq: OpenPKG, openpkg >= 20020206, fsl
AutoReq: no
AutoReqProv: no
@@ -58,19 +58,8 @@
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
- %setup2 -q -T -D -a 2
%build
- # build faked syslog(3) library
- fakesyslogdir="`pwd`/fakesyslog"
- ( cd fakesyslog
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --with-logfile=%{l_prefix}/var/smtpfeed/smtpfeed.log
- %{l_make} %{l_mflags}
- )
-
# build SMTPfeed
( cd smtpfeed-%{version}
chmod u+w version.c
@@ -78,9 +67,9 @@
-e 's;smtpfeed 1.[0-9]*;smtpfeed %{version};' \
version.c
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- LDFLAGS="-L$fakesyslogdir" \
- LIBS="-lfakesyslog" \
+ CFLAGS="`%{l_prefix}/bin/fsl-config --cflags`" \
+ LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags`" \
+ LIBS="`%{l_prefix}/bin/fsl-config --libs`" \
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags -O}
@@ -89,7 +78,9 @@
# build smtpfeed daemon
( cd smtpfeedd
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
+ CFLAGS="`%{l_prefix}/bin/fsl-config --cflags`" \
+ LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags`" \
+ LIBS="`%{l_prefix}/bin/fsl-config --libs`" \
./configure
%{l_make} %{l_mflags}
)
@@ -98,6 +89,7 @@
rm -rf $RPM_BUILD_ROOT
%{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}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
$RPM_BUILD_ROOT%{l_prefix}/var/smtpfeed
@@ -113,7 +105,13 @@
smtpfeedd/smtpfeedd $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE rc.smtpfeed} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.smtpfeed} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ '%config %{l_prefix}/etc/fsl/fsl.smtpfeed' \
+ '%not %dir %{l_prefix}/etc/fsl'
%files -f files
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
