mirror of
https://abf.rosa.ru/djam/nagios.git
synced 2025-02-23 18:12:48 +00:00
Automatic import for version 3.3.1
This commit is contained in:
Rosa
parent
86dcea93bc
commit
97fca770cf
5 changed files with 70 additions and 274 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"nagios-3.2.3.tar.gz": fcb2c016c1b803bac71442d0ee8375b737906421
|
||||
"nagios-3.3.1.tar.gz": 7b2523de0dacb51b5162dd53fc4c909397800125
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -Naurp nagios-3.1.0/html/includes/utils.inc.php nagios-3.1.0.oden/html/includes/utils.inc.php
|
||||
--- nagios-3.1.0/html/includes/utils.inc.php 2008-12-14 15:52:23.000000000 +0100
|
||||
+++ nagios-3.1.0.oden/html/includes/utils.inc.php 2009-01-25 18:48:27.000000000 +0100
|
||||
@@ -9,7 +9,7 @@ function get_update_information(){
|
||||
diff -Naur -x '*~' -x '*.rej' -x '*.orig' nagios/html/includes/utils.inc.php nagios-change-update-check-default/html/includes/utils.inc.php
|
||||
--- nagios/html/includes/utils.inc.php 2009-03-10 21:05:43.000000000 +0100
|
||||
+++ nagios-change-update-check-default/html/includes/utils.inc.php 2011-07-27 19:45:46.560953681 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
// initialize array
|
||||
$updateinfo=array(
|
||||
"found_update_info" => false,
|
||||
|
|
@ -10,22 +10,22 @@ diff -Naurp nagios-3.1.0/html/includes/utils.inc.php nagios-3.1.0.oden/html/incl
|
|||
"last_update_check" => "",
|
||||
"update_available" => false,
|
||||
"update_version" => "",
|
||||
diff -Naurp nagios-3.1.0/include/nagios.h nagios-3.1.0.oden/include/nagios.h
|
||||
--- nagios-3.1.0/include/nagios.h 2008-12-14 15:52:23.000000000 +0100
|
||||
+++ nagios-3.1.0.oden/include/nagios.h 2009-01-25 18:45:43.000000000 +0100
|
||||
@@ -125,7 +125,7 @@ extern "C" {
|
||||
diff -Naur -x '*~' -x '*.rej' -x '*.orig' nagios/include/nagios.h nagios-change-update-check-default/include/nagios.h
|
||||
--- nagios/include/nagios.h 2011-07-26 02:16:13.000000000 +0200
|
||||
+++ nagios-change-update-check-default/include/nagios.h 2011-07-27 20:18:33.789359890 +0200
|
||||
@@ -130,7 +130,7 @@
|
||||
|
||||
#define DEFAULT_ADDITIONAL_FRESHNESS_LATENCY 15 /* seconds to be added to freshness thresholds when automatically calculated by Nagios */
|
||||
|
||||
-#define DEFAULT_CHECK_FOR_UPDATES 1 /* should we check for new Nagios releases? */
|
||||
+#define DEFAULT_CHECK_FOR_UPDATES 0 /* should we check for new Nagios releases? no, we shouldn't... */
|
||||
+#define DEFAULT_CHECK_FOR_UPDATES 0 /* should we check for new Nagios releases? */
|
||||
#define DEFAULT_BARE_UPDATE_CHECK 0 /* report current version and new installs */
|
||||
#define MINIMUM_UPDATE_CHECK_INTERVAL 60*60*22 /* 22 hours minimum between checks - please be kind to our servers! */
|
||||
#define BASE_UPDATE_CHECK_INTERVAL 60*60*22 /* 22 hours base interval */
|
||||
diff -Naurp nagios-3.1.0/sample-config/nagios.cfg.in nagios-3.1.0.oden/sample-config/nagios.cfg.in
|
||||
--- nagios-3.1.0/sample-config/nagios.cfg.in 2009-01-25 18:48:53.000000000 +0100
|
||||
+++ nagios-3.1.0.oden/sample-config/nagios.cfg.in 2009-01-25 18:46:21.000000000 +0100
|
||||
@@ -729,7 +729,7 @@ interval_length=60
|
||||
diff -Naur -x '*~' -x '*.rej' -x '*.orig' nagios/sample-config/nagios.cfg.in nagios-change-update-check-default/sample-config/nagios.cfg.in
|
||||
--- nagios/sample-config/nagios.cfg.in 2010-10-04 04:27:55.000000000 +0200
|
||||
+++ nagios-change-update-check-default/sample-config/nagios.cfg.in 2011-07-27 19:45:46.562953657 +0200
|
||||
@@ -728,7 +728,7 @@
|
||||
# by Nagios Enterprises from the update check is processed in accordance
|
||||
# with our privacy policy - see http://api.nagios.org for details.
|
||||
|
||||
15
nagios-3.3.1-fix-html-install.patch
Normal file
15
nagios-3.3.1-fix-html-install.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff -Naur -x '*~' nagios/html/Makefile.in nagios-fix-html-install/html/Makefile.in
|
||||
--- nagios/html/Makefile.in 2011-07-24 19:53:52.000000000 +0200
|
||||
+++ nagios-fix-html-install/html/Makefile.in 2011-07-29 17:11:44.713436078 +0200
|
||||
@@ -75,9 +75,9 @@
|
||||
do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
|
||||
for file in includes/*.*; \
|
||||
do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
|
||||
- for file in includes/rss/*; \
|
||||
+ for file in includes/rss/*.inc; \
|
||||
do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
|
||||
- for file in includes/rss/extlib/*; \
|
||||
+ for file in includes/rss/extlib/*.inc; \
|
||||
do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
|
||||
|
||||
install-unstripped:
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
### BEGIN INIT INFO
|
||||
# Provides: nagios
|
||||
# Required-Start: $network
|
||||
# Requires-Stop: $network
|
||||
# Required-Stop: $network
|
||||
# Should-Start: httpd ndo2db
|
||||
# Should-Stop: httpd ndo2db
|
||||
# Default-Start: 3 4 5
|
||||
|
|
|
|||
281
nagios.spec
281
nagios.spec
|
|
@ -5,11 +5,8 @@
|
|||
|
||||
Summary: Host/service/network monitoring program
|
||||
Name: nagios
|
||||
Version: 3.2.3
|
||||
%if %mdkversion < 201000
|
||||
%define subrel 1
|
||||
%endif
|
||||
Release: %mkrel 2
|
||||
Version: 3.3.1
|
||||
Release: %mkrel 1
|
||||
License: GPLv2
|
||||
Group: Networking/Other
|
||||
URL: http://www.nagios.org/
|
||||
|
|
@ -18,15 +15,15 @@ Source1: %{name}.init
|
|||
Source4: http://nagios.sourceforge.net/download/contrib/misc/mergecfg/mergecfg
|
||||
Source5: favicon.ico
|
||||
Patch1: nagios-scandir.diff
|
||||
Patch5: nagios-mdv_conf.diff
|
||||
Patch2: nagios-mdv_conf.diff
|
||||
Patch6: nagios-DESTDIR.diff
|
||||
Patch8: nagios-3.1.0-no_update_check_per_default_please.diff
|
||||
Requires(post): rpm-helper nagios-conf
|
||||
Requires(preun): rpm-helper nagios-conf
|
||||
Requires(pre): rpm-helper apache-conf
|
||||
Requires(postun): rpm-helper apache-conf
|
||||
Requires: apache-conf
|
||||
Requires: nagios-conf
|
||||
Patch7: nagios-3.3.1-change-update-check-default.patch
|
||||
Patch8: nagios-3.3.1-fix-html-install.patch
|
||||
Requires(post): rpm-helper
|
||||
Requires(preun): rpm-helper
|
||||
Requires(pre): rpm-helper
|
||||
Requires(postun): rpm-helper
|
||||
Requires: apache
|
||||
Requires: nagios-plugins
|
||||
BuildRequires: gd-devel
|
||||
BuildRequires: imagemagick
|
||||
|
|
@ -34,10 +31,7 @@ BuildRequires: jpeg-devel
|
|||
BuildRequires: libtool-devel
|
||||
BuildRequires: multiarch-utils >= 1.0.3
|
||||
BuildRequires: perl-devel
|
||||
Obsoletes: netsaint
|
||||
Provides: netsaint
|
||||
Epoch: 1
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%description
|
||||
Nagios is a program that will monitor hosts and services on your
|
||||
|
|
@ -65,10 +59,6 @@ Requires: nail
|
|||
Requires: traceroute
|
||||
Requires: %{name}-imagepaks
|
||||
Requires: %{name}-theme
|
||||
%if %mdkversion < 201010
|
||||
Requires(post): rpm-helper
|
||||
Requires(postun): rpm-helper
|
||||
%endif
|
||||
Epoch: %{epoch}
|
||||
|
||||
%description www
|
||||
|
|
@ -86,12 +76,11 @@ interface. In addition, HTML documentation is included in this package
|
|||
%package theme-default
|
||||
Summary: Default Nagios theme
|
||||
Group: Networking/WWW
|
||||
Requires(pre): rpm-helper apache-mod_php
|
||||
Requires(postun): rpm-helper apache-mod_php
|
||||
Requires: apache-mod_php
|
||||
Requires: nagios-www = %{epoch}:%{version}-%{release}
|
||||
Provides: nagios-theme
|
||||
Conflicts: nagios-theme-nuvola
|
||||
BuildArch: noarch
|
||||
|
||||
%description theme-default
|
||||
Original theme from Nagios.
|
||||
|
|
@ -112,10 +101,11 @@ This package provides include files that Nagios-related applications may
|
|||
compile against.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n nagios
|
||||
%patch1 -p0
|
||||
%patch5 -p0
|
||||
%patch2 -p0
|
||||
%patch6 -p0
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
cp %{SOURCE1} nagios.init
|
||||
|
|
@ -130,7 +120,7 @@ export CXXFLAGS="$CXXFLAGS -fPIC"
|
|||
export FFLAGS="$FFLAGS -fPIC"
|
||||
%define _disable_ld_no_undefined 1
|
||||
%configure2_5x \
|
||||
--with-httpd-conf=%{_sysconfdir}/httpd/conf/webapps.d \
|
||||
--with-httpd-conf=%{_webappconfdir} \
|
||||
--with-checkresult-dir=/var/spool/nagios/checkresults \
|
||||
--with-temp-dir=/tmp \
|
||||
--with-init-dir=%{_initrddir} \
|
||||
|
|
@ -179,7 +169,7 @@ popd
|
|||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
install -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf/webapps.d
|
||||
install -d -m0755 %{buildroot}%{_webappconfdir}
|
||||
install -d -m0755 %{buildroot}/var/spool/nagios/checkresults
|
||||
install -d -m0755 %{buildroot}/var/run/nagios
|
||||
install -d -m0755 %{buildroot}%{_includedir}/nagios
|
||||
|
|
@ -200,9 +190,6 @@ make \
|
|||
INSTALL_OPTS="" \
|
||||
LOGDIR=/var/log/nagios \
|
||||
STRIP=/bin/true \
|
||||
install \
|
||||
install-html \
|
||||
install-commandmode \
|
||||
install-config \
|
||||
fullinstall
|
||||
|
||||
|
|
@ -291,180 +278,12 @@ find %{buildroot}%{_libdir}/nagios/plugins/eventhandlers -type f | \
|
|||
-e 's|/usr/local/nagios/etc/send_nsca.cfg|%{_sysconfdir}/nagios/send_nsca.cfg|g;' \
|
||||
-e 's|printfcmd="/bin/printf"|printfcmd="/usr/bin/printf"|;'
|
||||
|
||||
# Mandriva Icons
|
||||
install -d %{buildroot}%{_iconsdir}
|
||||
install -d %{buildroot}%{_miconsdir}
|
||||
install -d %{buildroot}%{_liconsdir}
|
||||
|
||||
convert html/images/logofullsize.png -resize 16x16 %{buildroot}%{_miconsdir}/%{name}.png
|
||||
convert html/images/logofullsize.png -resize 32x32 %{buildroot}%{_iconsdir}/%{name}.png
|
||||
convert html/images/logofullsize.png -resize 48x48 %{buildroot}%{_liconsdir}/%{name}.png
|
||||
|
||||
# XDG menu
|
||||
install -d %{buildroot}%{_datadir}/applications
|
||||
cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Name=Nagios
|
||||
Comment=%{summary}
|
||||
Exec=%{_bindir}/www-browser http://localhost/%{name}/
|
||||
Icon=%{name}
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=X-MandrivaLinux-System-Monitoring;System;Monitor;
|
||||
EOF
|
||||
|
||||
%multiarch_includes %{buildroot}%{_includedir}/nagios/locations.h
|
||||
#multiarch_includes %{buildroot}%{_includedir}/nagios/locations.h
|
||||
|
||||
# install the favicon.ico
|
||||
install -m0644 favicon.ico %{buildroot}%{_datadir}/nagios/www
|
||||
|
||||
cat > README.mdv << EOF
|
||||
Mandriva Nagios package
|
||||
|
||||
The default configuration that used to come with this package now lives in the
|
||||
nagios-conf package. You can easily adapt the nagios-conf package to suit your
|
||||
specific taste. You may want to adjust the cgi.cfg, nagios.cfg and resource.cfg
|
||||
configuration files found in the /etc/nagios directory.
|
||||
|
||||
The old nagios-plugins package used to come with all plugins in one single
|
||||
package has been broken out into multiple sub packages. As of today Jan 14 2008
|
||||
there are over 100 nagios plugins to your disposal. Here is a list of plugins
|
||||
you can install that stems from the nagios-plugins source:
|
||||
|
||||
o nagios-check_adptraid
|
||||
o nagios-check_apache
|
||||
o nagios-check_apc_ups
|
||||
o nagios-check_appletalk
|
||||
o nagios-check_apt
|
||||
o nagios-check_arping
|
||||
o nagios-check_asterisk
|
||||
o nagios-check_axis
|
||||
o nagios-check_backup
|
||||
o nagios-check_bgp
|
||||
o nagios-check_bgpstate
|
||||
o nagios-check_breeze
|
||||
o nagios-check_by_ssh
|
||||
o nagios-check_ciscotemp
|
||||
o nagios-check_cluster
|
||||
o nagios-check_cluster2
|
||||
o nagios-check_compaq_insight
|
||||
o nagios-check_dhcp
|
||||
o nagios-check_dig
|
||||
o nagios-check_digitemp
|
||||
o nagios-check_disk
|
||||
o nagios-check_disk_smb
|
||||
o nagios-check_dlswcircuit
|
||||
o nagios-check_dns
|
||||
o nagios-check_dns_random
|
||||
o nagios-check_dummy
|
||||
o nagios-check_email_loop
|
||||
o nagios-check_file_age
|
||||
o nagios-check_flexlm
|
||||
o nagios-check_fping
|
||||
o nagios-check_frontpage
|
||||
o nagios-check_game
|
||||
o nagios-check_hpjd
|
||||
o nagios-check_hprsc
|
||||
o nagios-check_http
|
||||
o nagios-check_hw
|
||||
o nagios-check_ica_master_browser
|
||||
o nagios-check_ica_metaframe_pub_apps
|
||||
o nagios-check_ica_program_neigbourhood
|
||||
o nagios-check_icmp
|
||||
o nagios-check_ide_smart
|
||||
o nagios-check_ifoperstatus
|
||||
o nagios-check_ifstatus
|
||||
o nagios-check_inodes
|
||||
o nagios-check_ipxping
|
||||
o nagios-check_ircd
|
||||
o nagios-check_javaproc
|
||||
o nagios-check_ldap
|
||||
o nagios-check_linux_raid
|
||||
o nagios-check_load
|
||||
o nagios-check_log
|
||||
o nagios-check_log2
|
||||
o nagios-check_lotus
|
||||
o nagios-check_mailq
|
||||
o nagios-check_maxchannels
|
||||
o nagios-check_maxwanstate
|
||||
o nagios-check_mem
|
||||
o nagios-check_mrtg
|
||||
o nagios-check_mrtgext
|
||||
o nagios-check_mrtgtraf
|
||||
o nagios-check_ms_spooler
|
||||
o nagios-check_mssql
|
||||
o nagios-check_mysql
|
||||
o nagios-check_mysql_perf <- added from third part
|
||||
o nagios-check_mysql_query
|
||||
o nagios-check_nagios
|
||||
o nagios-check_netapp
|
||||
o nagios-check_nmap
|
||||
o nagios-check_nt
|
||||
o nagios-check_ntp
|
||||
o nagios-check_ntp_peer
|
||||
o nagios-check_ntp_time
|
||||
o nagios-check_nwstat
|
||||
o nagios-check_oracle
|
||||
o nagios-check_overcr
|
||||
o nagios-check_pcpmetric
|
||||
o nagios-check_pfstate
|
||||
o nagios-check_pgsql
|
||||
o nagios-check_ping
|
||||
o nagios-check_procs
|
||||
o nagios-check_qmailq
|
||||
o nagios-check_radius
|
||||
o nagios-check_rbl
|
||||
o nagios-check_real
|
||||
o nagios-check_remote_nagios_status
|
||||
o nagios-check_rpc
|
||||
o nagios-check_sendim
|
||||
o nagios-check_sensors
|
||||
o nagios-check_smart
|
||||
o nagios-check_smb
|
||||
o nagios-check_smtp
|
||||
o nagios-check_snmp
|
||||
o nagios-check_snmp_disk_monitor
|
||||
o nagios-check_snmp_printer
|
||||
o nagios-check_snmp_process_monitor
|
||||
o nagios-check_snmp_procs
|
||||
o nagios-check_sockets
|
||||
o nagios-check_ssh
|
||||
o nagios-check_swap
|
||||
o nagios-check_tcp
|
||||
o nagios-check_time
|
||||
o nagios-check_timeout
|
||||
o nagios-check_traceroute
|
||||
o nagios-check_ups
|
||||
o nagios-check_uptime
|
||||
o nagios-check_users
|
||||
o nagios-check_wave
|
||||
o nagios-check_wins
|
||||
|
||||
This break-out has been done to reduce the overall dependencies requirements,
|
||||
so if you don't need any of the check_mysql_* plugins you won't have to install
|
||||
the mysql libraries, and so on.
|
||||
|
||||
Each of these packages comes with its own configuration file that contains the
|
||||
needed command definition(s), let's give an example:
|
||||
|
||||
$ cat /etc/nagios/plugins.d/check_arping.cfg
|
||||
# this plugin require suid bit. chmod 4550 /usr/lib64/nagios/plugins/contrib/check_arping.pl
|
||||
|
||||
# 'check_arping' command definition
|
||||
define command{
|
||||
command_name check_arping
|
||||
command_line /usr/lib64/nagios/plugins/contrib/check_arping.pl -I $ARG1$ -H $HOSTADDRESS$
|
||||
}
|
||||
|
||||
|
||||
So when you start the nagios daemon it will automatically load configuration
|
||||
files found in the /etc/nagios/plugins.d and /etc/nagios/conf.d directories.
|
||||
|
||||
EOF
|
||||
|
||||
%if %mdkversion >= 200900
|
||||
# automatic reloading for new plugins
|
||||
# (see http://wiki.mandriva.com/en/Rpm_filetriggers)
|
||||
install -d %buildroot%{_var}/lib/rpm/filetriggers
|
||||
cat > %buildroot%{_var}/lib/rpm/filetriggers/nagios.filter << EOF
|
||||
^.%{_sysconfdir}/nagios/plugins.d/.*\.cfg$
|
||||
|
|
@ -474,63 +293,26 @@ cat > %buildroot%{_var}/lib/rpm/filetriggers/nagios.script << EOF
|
|||
/etc/init.d/nagios condrestart
|
||||
EOF
|
||||
chmod 755 %buildroot%{_var}/lib/rpm/filetriggers/nagios.script
|
||||
%endif
|
||||
|
||||
%pre
|
||||
%{_sbindir}/useradd -r -M -s /bin/sh -d /var/log/nagios -c "system user for %{nsusr}" %{nsusr} >/dev/null 2>&1 || :
|
||||
%_pre_useradd %{nsusr} /var/log/nagios /bin/sh
|
||||
%{_bindir}/gpasswd -a %{cmdusr} %{nsgrp} >/dev/null 2>&1 || :
|
||||
|
||||
%post
|
||||
if [ $1 = 1 ] ; then
|
||||
chown -R %{nsusr}:%{nsgrp} /var/log/nagios /var/spool/nagios /var/run/nagios >/dev/null 2>&1 || :
|
||||
fi
|
||||
%_post_service %{name}
|
||||
|
||||
%preun
|
||||
%_preun_service %{name}
|
||||
|
||||
%postun
|
||||
if [ "$1" -ge "1" ]; then
|
||||
%{_initrddir}/%{name} condrestart >/dev/null 2>&1 || :
|
||||
fi
|
||||
%_postun_userdel %{nsusr}
|
||||
|
||||
%pretrans www
|
||||
# fix for old apache configuration
|
||||
if [ -f %{_sysconfdir}/httpd/conf/webapps.d/12_nagios.conf ]; then
|
||||
mv %{_sysconfdir}/httpd/conf/webapps.d/12_nagios.conf \
|
||||
%{_sysconfdir}/httpd/conf/webapps.d/nagios.conf
|
||||
perl -pi -e 's|%{_datadir}/%{name}|%{_datadir}/%{name}/www|' \
|
||||
%{_sysconfdir}/httpd/conf/webapps.d/nagios.conf
|
||||
fi
|
||||
|
||||
%post www
|
||||
%if %mdkversion < 201010
|
||||
%_post_webapp
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun www
|
||||
%if %mdkversion < 201010
|
||||
%_postun_webapp
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc Changelog INSTALLING LEGAL README UPGRADING README.mdv
|
||||
%doc Changelog INSTALLING LEGAL README UPGRADING
|
||||
%doc sample-config/mrtg.cfg
|
||||
%{_initrddir}/nagios
|
||||
%{_sbindir}/*
|
||||
%dir %{_sysconfdir}/nagios
|
||||
%config(noreplace) %{_sysconfdir}/nagios/*.cfg
|
||||
%dir %{_sysconfdir}/nagios/servers
|
||||
%dir %{_sysconfdir}/nagios/printers
|
||||
%dir %{_sysconfdir}/nagios/switches
|
||||
|
|
@ -538,6 +320,7 @@ rm -rf %{buildroot}
|
|||
%dir %{_sysconfdir}/nagios/conf.d
|
||||
%dir %{_sysconfdir}/nagios/plugins.d
|
||||
%dir %{_sysconfdir}/nagios/objects
|
||||
%config(noreplace) %{_sysconfdir}/nagios/*.cfg
|
||||
%config(noreplace) %{_sysconfdir}/nagios/objects/*.cfg
|
||||
%attr(-,%{nsusr},%{nsgrp}) %dir /var/log/nagios
|
||||
%attr(-,%{nsusr},%{nsgrp}) %dir /var/log/nagios/archives
|
||||
|
|
@ -546,13 +329,10 @@ rm -rf %{buildroot}
|
|||
%attr(-,%{nsusr},%{nsgrp}) %dir /var/run/nagios
|
||||
%dir %{_libdir}/nagios/plugins/eventhandlers
|
||||
%{_libdir}/nagios/plugins/eventhandlers/*
|
||||
%if %mdkversion >= 200900
|
||||
%{_var}/lib/rpm/filetriggers/nagios.*
|
||||
%endif
|
||||
|
||||
%files www
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/httpd/conf/webapps.d/nagios.conf
|
||||
%config(noreplace) %{_webappconfdir}/nagios.conf
|
||||
%{_libdir}/nagios/cgi
|
||||
%dir %{_datadir}/nagios/www
|
||||
%dir %{_datadir}/nagios/www/images
|
||||
|
|
@ -563,26 +343,27 @@ rm -rf %{buildroot}
|
|||
%{_datadir}/nagios/www/docs
|
||||
%{_datadir}/nagios/www/media
|
||||
%{_datadir}/nagios/www/ssi
|
||||
%{_iconsdir}/%{name}.png
|
||||
%{_miconsdir}/%{name}.png
|
||||
%{_liconsdir}/%{name}.png
|
||||
%{_datadir}/applications/*.desktop
|
||||
|
||||
%files theme-default
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/nagios/www/*.php
|
||||
%{_datadir}/nagios/www/images/*
|
||||
%{_datadir}/nagios/www/includes/*
|
||||
%{_datadir}/nagios/www/stylesheets/*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%multiarch %{multiarch_includedir}/nagios/locations.h
|
||||
#multiarch %{multiarch_includedir}/nagios/locations.h
|
||||
%{_includedir}/nagios
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Feb 05 2011 Funda Wang <fwang@mandriva.org> 1:3.2.3-2mdv2011.0
|
||||
* Sun Jan 01 2012 Luis Daniel Lucio Quiroz <dlucio@mandriva.org> 1:3.3.1-1mdv2012.0
|
||||
+ Revision: 748649
|
||||
- 3.3.1
|
||||
from mageia, thanks
|
||||
|
||||
* Sat Feb 05 2011 Funda Wang <fwang@mandriva.org> 1:3.2.3-2
|
||||
+ Revision: 636326
|
||||
- tighten BR
|
||||
|
||||
|
|
@ -749,7 +530,7 @@ rm -rf %{buildroot}
|
|||
+ Thierry Vignaud <tv@mandriva.org>
|
||||
- drop old menu
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
+ Olivier Blin <blino@mandriva.org>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Guillaume Rousse <guillomovitch@mandriva.org>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue