make requirement of ldap configurable; fix nagios-group settings for nagios plugins

nagios/nagios.spec

@@ -37,11 +37,12 @@ Class:        EVAL
 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 @@ Patch0:       nagios.patch
 #   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 @@ AutoReqProv:  no
           --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 $?