OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Jun-2003 22:50:36
Branch: HEAD Handle: 2003062321503600
Modified files:
openpkg-src/monit monit.spec
Log:
make fsl optional with default yes, as promised for the next release
Summary:
Revision Changes Path
1.5 +21 -13 openpkg-src/monit/monit.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 monit.spec
--- openpkg-src/monit/monit.spec 23 Jun 2003 11:10:20 -0000 1.4
+++ openpkg-src/monit/monit.spec 23 Jun 2003 20:50:36 -0000 1.5
@@ -36,6 +36,7 @@
Release: 20030623
# package options
+%option with_fsl yes
%option with_ssl no
# list of sources
@@ -47,8 +48,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, make, gcc, bison, flex, fsl
-PreReq: OpenPKG, openpkg >= 20030103, fsl
+BuildPreReq: OpenPKG, openpkg >= 20030415, make, gcc, bison, flex
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
%endif
@@ -74,8 +79,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}" \
piddir="%{l_prefix}/var/monit" \
./configure \
--prefix=%{l_prefix} \
@@ -98,11 +103,6 @@
-e 's;@l_sgrp@;%{l_sgrp};g' \
%{SOURCE rc.monit} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{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.monit} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
%{l_shtool} mkdir -f -p -m 700 \
$RPM_BUILD_ROOT%{l_prefix}/etc/monit
%{l_shtool} install -c -m 600 \
@@ -112,12 +112,20 @@
%{l_shtool} mkdir -f -p -m 700 \
$RPM_BUILD_ROOT%{l_prefix}/var/monit
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ # 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/
+
+ %{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}' \
'%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit/*' \
'%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit' \
- '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/var/monit' \
- '%config %{l_prefix}/etc/fsl/fsl.monit' \
- '%not %dir %{l_prefix}/etc/fsl'
+ '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/var/monit'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
