OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Jan-2006 14:31:15
Branch: HEAD Handle: 2006012313311500
Modified files:
openpkg-src/nagios nagios.spec
Log:
make requirement of ldap configurable; fix nagios-group settings for
nagios plugins
Summary:
Revision Changes Path
1.42 +7 -2 openpkg-src/nagios/nagios.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 nagios.spec
--- openpkg-src/nagios/nagios.spec 1 Jan 2006 13:17:07 -0000 1.41
+++ openpkg-src/nagios/nagios.spec 23 Jan 2006 13:31:15 -0000 1.42
@@ -37,11 +37,12 @@
Group: Network
License: GNU
Version: %{V_nagios}
-Release: 20051118
+Release: 20060123
# package options
%option with_eperl yes
%option with_fsl yes
+%option with_ldap yes
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-%{V_nagios}.tar.gz
@@ -54,7 +55,11 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
+%if "%{with_ldap}" == "yes"
BuildPreReq: OpenPKG, openpkg >= 20040130, traceroute, gcc, openldap
+%else
+BuildPreReq: OpenPKG, openpkg >= 20040130, traceroute, gcc
+%endif
PreReq: OpenPKG, openpkg >= 20040130, traceroute, apache, MTA
BuildPreReq: zlib, jpeg, png, gd
PreReq: zlib, jpeg, png, gd
@@ -137,7 +142,7 @@
--with-df-command=%{l_prefix}/bin/gdf \
--with-ping-command="%{l_prefix}/bin/gping -n -c %d %s" \
--with-nagios-user=%{l_musr} \
- --with-nagios-grp=%{l_mgrp} \
+ --with-nagios-group=%{l_mgrp} \
--with-cgiurl=/nagios/cgi
%{l_make} %{l_mflags}
) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
