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 23:01:52
Branch: HEAD Handle: 2003062322014903
Modified files:
openpkg-src/smtpfeed smtpfeed.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.41 +27 -14 openpkg-src/smtpfeed/smtpfeed.spec
1.4971 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/smtpfeed.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 smtpfeed.spec
--- openpkg-src/smtpfeed/smtpfeed.spec 30 May 2003 19:48:17 -0000 1.40
+++ openpkg-src/smtpfeed/smtpfeed.spec 23 Jun 2003 21:01:52 -0000 1.41
@@ -33,7 +33,10 @@
Group: Mail
License: GPL
Version: 1.18
-Release: 20030530
+Release: 20030623
+
+# package options
+%option with_fsl yes
# list of sources
Source0:
ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/smtpfeed-%{version}.tar.gz
@@ -44,8 +47,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030516, fsl
-PreReq: OpenPKG, openpkg >= 20030516, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030516
+PreReq: OpenPKG, openpkg >= 20030516
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -67,8 +74,8 @@
version.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags}" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
- LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags -O}
@@ -77,9 +84,8 @@
# build smtpfeed daemon
( cd smtpfeedd
CC="%{l_cc}" \
- CFLAGS="`%{l_prefix}/bin/fsl-config --cflags`" \
- LDFLAGS="`%{l_prefix}/bin/fsl-config --all --ldflags`" \
- LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure
%{l_make} %{l_mflags}
)
@@ -88,7 +94,6 @@
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
@@ -104,11 +109,19 @@
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_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'
+
+ # 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.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # 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}'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4970 -r1.4971 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:01:38 -0000 1.4970
+++ openpkg-web/news.txt 23 Jun 2003 21:01:49 -0000 1.4971
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<smtpfeed-1.18-20030623>
23-Jun-2003: Upgraded package: P<sendmail-8.12.9-20030623>
23-Jun-2003: Upgraded package: P<sasl-2.1.13-20030623>
23-Jun-2003: Upgraded package: P<qpopper-4.0.5-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
