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:02:18
Branch: HEAD Handle: 2003062322021602
Modified files:
openpkg-src/whoson whoson.spec
openpkg-web news.txt
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.2 +19 -10 openpkg-src/whoson/whoson.spec
1.4974 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/whoson.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 whoson.spec
--- openpkg-src/whoson/whoson.spec 15 Apr 2003 14:57:28 -0000 1.1
+++ openpkg-src/whoson/whoson.spec 23 Jun 2003 21:02:18 -0000 1.2
@@ -33,9 +33,10 @@
Group: Mail
License: GPL
Version: 2.02a
-Release: 20030415
+Release: 20030623
# package options
+%option with_fsl yes
%option with_perl no
# list of sources
@@ -47,8 +48,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, fsl
-PreReq: OpenPKG, openpkg >= 20030103, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_perl}" == "yes"
BuildPreReq: perl, perl-openpkg
PreReq: perl, perl-openpkg
@@ -76,8 +81,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
- 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}" \
--with-config="%{l_prefix}/etc/whoson/whoson.conf" \
@@ -98,7 +103,6 @@
%{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}/etc/whoson \
$RPM_BUILD_ROOT%{l_prefix}/var/whoson/run \
$RPM_BUILD_ROOT%{l_prefix}/var/whoson/log \
@@ -117,13 +121,18 @@
%{SOURCE rc.whoson} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # add fsl configuration
- %{l_shtool} install -c -m 755 \
+ # 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.whoson} \
+ %{SOURCE fsl.%{name}} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ # 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}' \
'%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson' \
'%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/run' \
'%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/log' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4973 -r1.4974 news.txt
--- openpkg-web/news.txt 23 Jun 2003 21:02:07 -0000 1.4973
+++ openpkg-web/news.txt 23 Jun 2003 21:02:16 -0000 1.4974
@@ -1,3 +1,4 @@
+23-Jun-2003: Upgraded package: P<whoson-2.02a-20030623>
23-Jun-2003: Upgraded package: P<vrrpd-0.8.7-20030623>
23-Jun-2003: Upgraded package: P<teapop-0.3.5-20030623>
23-Jun-2003: Upgraded package: P<smtpfeed-1.18-20030623>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
