patch: fix nagios.spec

[Andreas Ericsson]

Rui Miguel Seabra wrote:
> Hi,
> 
> nagios.spec has not received maintenance in a while.
> 
> I'm giving some help here (see attached file).
> 
> Next on my TODO:
>   * gettext support
>   * move layout to a CSS controlled one
> 
> Are these two items desireable?
> 

I for one would strongly discourage the implementation of gettext in a 
system daemon. For the gui it's another matter, but that should be 
resolved at a later date when it is rewritten in PHP.

Layout is already (somewhat) CSS controlled, although a couple of style 
tags definitely needs to be removed from the cgi code. I submitted a 
patch some time back which includes a common.css stylesheet file. If you 
want to start moving to a more stylesheet-oriented design (which can 
only be a good thing), I suggest you start by dropping redundant and 
obsolete statements from the current stylesheets and add statements 
found in multiple files to the common.css file. Also, it would be nice 
to see the stylesheets actually use the cascade functionality, and drop 
font-family: and other tags from style-classes that doesn't need them.

> Thanks, Rui
> 
> 
> 
> ------------------------------------------------------------------------
> 
> Index: nagios.spec
> ===================================================================
> RCS file: /cvsroot/nagios/nagios/nagios.spec,v
> retrieving revision 1.20
> diff -u -r1.20 nagios.spec
> --- nagios.spec	14 Dec 2004 02:18:58 -0000	1.20
> +++ nagios.spec	30 Dec 2004 12:09:02 -0000
> @@ -27,7 +27,7 @@
>  Name: %{name}
>  Version: %{version}
>  Release: %{release}
> -Copyright: GPL
> +License: GPL
>  Group: Application/System
>  Source0: %{name}-%{version}.tar.gz
>  BuildRoot: %{_tmppath}/%{name}-buildroot
> @@ -268,13 +268,13 @@
>  install -m 0644 include/locations.h ${RPM_BUILD_ROOT}%{_prefix}/include/nagios
>  
>  # install httpd configuration in RH80-style httpd config subdir
> -cp contrib/htaccess.sample ${RPM_BUILD_ROOT}/etc/httpd/conf.d/nagios.conf
> +# cp contrib/htaccess.sample ${RPM_BUILD_ROOT}/etc/httpd/conf.d/nagios.conf
>  
>  # install CGIs
>  cd contrib
> -make INSTALL=install INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR=${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi install
> -mv ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi/convertcfg ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/
> -mv ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi/mini_epn ${RPM_BUILD_ROOT}%{_prefix}/sbin/
> +make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR=%{_libdir}/nagios/cgi install
> +#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi/convertcfg ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/
> +#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi/mini_epn ${RPM_BUILD_ROOT}%{_prefix}/sbin/
>  cd ..
>  
>  # install event handlers
> @@ -301,7 +301,7 @@
>  %{_prefix}/sbin/mini_epn
>  %dir %{_prefix}/lib/nagios/eventhandlers
>  %{_prefix}/lib/nagios/eventhandlers/*
> -%{_prefix}/lib/nagios/convertcfg
> +%{_sbindir}/convertcfg
>  %dir /etc/nagios
>  %defattr(644,root,root)
>  %config(noreplace) /etc/nagios/*.cfg
> @@ -320,11 +320,11 @@
>  %files www
>  %defattr(755,root,root)
>  %dir %{_prefix}/lib/nagios/cgi
> -%{_prefix}/lib/nagios/cgi/*
> +%{_libdir}/nagios/cgi/*
>  %dir %{_prefix}/share/nagios
>  %defattr(-,root,root)
>  %{_prefix}/share/nagios/*
> -%config(noreplace) /etc/httpd/conf.d/nagios.conf
> +#%config(noreplace) /etc/httpd/conf.d/nagios.conf
>  
>  
>  %files devel
> @@ -334,6 +334,9 @@
>  
>  
>  %changelog
> +* Thu Dec 30 2004 Rui Miguel Silva Seabra <rms at sibs.pt>
> +- FIX spec (wrong tag for License, and update to current state of compile)
> +
>  * Sat May 31 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.1-1)
>  - Merge with CVS for 1.1 release
>  

-- 
Andreas Ericsson                   andreas.ericsson at op5.se
OP5 AB                             www.op5.se
Lead Developer


-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt