[nagios-plugins] Remove the erroneous requirements of nagios-plugins-ntp (#848830) Ship check-ntp.pl in the new nagio

[Jose Pedro Oliveira]

commit 7153b921a87987a934bba0033fe483d8d3d1bd7a
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Thu Aug 16 19:02:29 2012 +0100

    Remove the erroneous requirements of nagios-plugins-ntp (#848830)
    Ship check-ntp.pl in the new nagios-plugins-ntp-perl subpackage (#848830)

 nagios-plugins.spec |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 3a43b70..6257c6c 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -60,7 +60,7 @@ contains those plugins.
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave, nagios-plugins-cluster
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-ntp-perl, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave, na
 gios-plugins-cluster
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -339,13 +339,20 @@ Provides check_nt support for Nagios.
 Summary: Nagios Plugin - check_ntp
 Group: Applications/System
 Requires: nagios-plugins = %{version}-%{release}
-Requires: %{_sbindir}/ntpdate
-Requires: %{_sbindir}/ntpdc
-Requires: %{_sbindir}/ntpq
 
 %description ntp
 Provides check_ntp support for Nagios.
 
+%package ntp-perl
+Summary: Nagios Plugin - check_ntp.pl
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+Requires: %{_sbindir}/ntpdate
+Requires: %{_sbindir}/ntpq
+
+%description ntp-perl
+Provides check_ntp.pl support for Nagios.
+
 %package nwstat
 Summary: Nagios Plugin - check_nwstat
 Group: Applications/System
@@ -583,6 +590,7 @@ install -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 install -m 0755 contrib/check_linux_raid %{buildroot}/%{_libdir}/nagios/plugins
 install -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 install -m 0755 plugins/check_ldap %{buildroot}/%{_libdir}/nagios/plugins
+install -m 0755 plugins-scripts/check_ntp.pl %{buildroot}/%{_libdir}/nagios/plugins
 %if 0%{?el4}
 %else
 install -m 0755 plugins/check_radius %{buildroot}/%{_libdir}/nagios/plugins
@@ -741,6 +749,10 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/check_ntp_peer
 %{_libdir}/nagios/plugins/check_ntp_time
 
+%files ntp-perl
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_ntp.pl
+
 %files nwstat
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_nwstat
@@ -838,6 +850,10 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/check_wave
 
 %changelog
+* Thu Aug 16 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.4.16-4
+- Remove the erroneous requirements of nagios-plugins-ntp (#848830)
+- Ship check-ntp.pl in the new nagios-plugins-ntp-perl subpackage (#848830)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild