Changes - j0ke.net Open Build Service

Changes of Revision 53

[-] [+]	Changed	nagios-plugins.changes
@@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Nov 22 17:14:09 UTC 2014 - cs@linux-administrator.com + +- update to release 2.1 +- add new provides for package monitoring-plugins (project name change) +- add buildrequires for fping plugin +- add buildrequires for radius plugin + +------------------------------------------------------------------- Tue Jun 24 15:11:22 UTC 2014 - cs@linux-administrator.com - backport DNS fixes from master
[-] [+]	Changed	nagios-plugins.spec ^
@@ -1,22 +1,24 @@ #!BuildIgnore: post-build-checks +%define pkgname monitoring-plugins Name: nagios-plugins -Version: 2.0.2 +Version: 2.1 Release: 35 Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System License: GPL -URL: http://nagiosplug.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.bz2 +URL: https://www.monitoring-plugins.org/ +Source0: %{pkgname}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Patch100: nagios-plugins_DISABLE-SMARTENABLE.patch +#Patch100: nagios-plugins_DISABLE-SMARTENABLE.patch Patch200: revert-check_mailq-autodetect.diff -Patch201: nagios-plugins-2.0.2_dnsfix.patch +#Patch201: nagios-plugins-2.0.2_dnsfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Prefix: %{_prefix}/lib/nagios/plugins PreReq: sed +Provides: %{pkgname}-%{version}-%{release} %{!?custom:%global custom 0} Obsoletes: nagios-plugins-custom nagios-plugins-extras @@ -33,20 +35,27 @@ %if 0%{?suse_version} BuildRequires: tcpd-devel libsmbclient libsmbclient-devel openldap2-devel perl-Net-SNMP fping glibc bind-utils +BuildRequires: freeradius-client-devel freeradius-server-devel %endif + %if 0%{?fedora_version} \|\| 0%{?centos_version} \|\| 0%{?rhel_version} \|\| 0%{?redhat_version} \|\| 0%{?sl_version} BuildRequires: tcp_wrappers openldap-devel freeradius samba-common openldap-devel net-snmp-perl glibc-common %endif -BuildRequires: openssl-devel postgresql-devel mysql-devel zlib-devel glibc-devel libgcc gcc gcc-c++ net-snmp net-snmp-devel openssh qstat iputils samba-client procps +# fping is in EPEL for EL +BuildRequires: openssl-devel postgresql-devel mysql-devel zlib-devel glibc-devel libgcc gcc gcc-c++ net-snmp net-snmp-devel openssh qstat iputils samba-client procps fping + Requires: qstat iputils + %if 0%{?fedora_version} \|\| 0%{?centos_version} \|\| 0%{?rhel_version} \|\| 0%{?redhat_version} \|\| 0%{?sl_version} Requires: /usr/bin/smbclient %else Requires: samba-client %endif + + %description Nagios is a program that will monitor hosts and services on your network, and to email or page you when a problem arises or is @@ -58,10 +67,10 @@ %prep -%setup -q -%patch100 +%setup -q -n %{pkgname}-%{version} +##%patch100 %patch200 -p1 -%patch201 -p1 +##%patch201 -p1 %build ./configure \ @@ -71,6 +80,8 @@ --sysconfdir=%{_sysconfdir}/nagios \ --datadir=%{_datadir} \ --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" \ +--with-fping-command=%{_sbindir}/fping \ +--with-fping6-command=%{_sbindir}/fping6 \ --with-ipv6 \ --with-cgiurl=/nagios/cgi-bin \ --with-rpcinfo-command=%{_sbindir}/rpcinfo \ @@ -85,7 +96,7 @@ %__make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install-root %__install -d ${RPM_BUILD_ROOT}/etc/nagios ##__install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios -%find_lang %{name} +##%find_lang %{name} # fix lib path in perl plugins cd ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/plugins # set qmail-qstat if not found @@ -99,15 +110,16 @@ chmod 4711 %{_exec_prefix}/lib/nagios/plugins/check_icmp \|\| : chmod 4711 %{_exec_prefix}/lib/nagios/plugins/check_dhcp \|\| : -%files -f %{name}.lang +##%files -f %{name}.lang +%files %defattr(-,root,root) ##config(missingok,noreplace) /etc/nagios/command.cfg %doc CODING COPYING FAQ LEGAL README REQUIREMENTS SUPPORT THANKS %doc ChangeLog %defattr(775,root,root) %dir %{_exec_prefix}/lib/nagios/plugins -%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo -%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo +%{_datadir}/locale/de/LC_MESSAGES/%{pkgname}.mo +%{_datadir}/locale/fr/LC_MESSAGES/%{pkgname}.mo %{_exec_prefix}/lib/nagios/plugins %changelog
	Added	monitoring-plugins-2.1.tar.bz2 ^