[svn] r5296 - in trunk/rpms: jigdo nagios-plugins

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Apr 18 18:34:00 CEST 2007 

Author: dag
Date: 2007-04-18 18:34:00 +0200 (Wed, 18 Apr 2007)
New Revision: 5296

Modified:
   trunk/rpms/jigdo/jigdo.spec
   trunk/rpms/nagios-plugins/nagios-plugins.spec
Log:
Updates

Modified: trunk/rpms/jigdo/jigdo.spec
===================================================================
--- trunk/rpms/jigdo/jigdo.spec	2007-04-18 16:03:32 UTC (rev 5295)
+++ trunk/rpms/jigdo/jigdo.spec	2007-04-18 16:34:00 UTC (rev 5296)
@@ -4,6 +4,8 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%define desktop_vendor rpmforge
+
 Summary: Tool for distributing large files
 Name: jigdo
 Version: 0.7.3
@@ -32,7 +34,7 @@
 %prep
 %setup
 
-%{__cat} <<EOF >%{name}.desktop
+%{__cat} <<EOF >jigdo.desktop
 [Desktop Entry]
 Name=Jigdo
 Comment=Download large files from jigdo enabled webservers.
@@ -58,31 +60,28 @@
 %find_lang %{name}
 
 %{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
-desktop-file-install --vendor rpmforge             \
+desktop-file-install --vendor %{desktop_vendor}    \
 	--add-category X-Red-Hat-Base              \
 	--dir %{buildroot}%{_datadir}/applications \
-	%{name}.desktop
+	jigdo.desktop
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc changelog COPYING README THANKS
-%doc %{_mandir}/man1/jigdo*
+%doc changelog COPYING README THANKS doc/
+%doc %{_mandir}/man1/jigdo.1*
 %{_bindir}/jigdo
 %{_bindir}/jigdo-file
 %{_bindir}/jigdo-lite
 %{_bindir}/jigdo-mirror
 %{_datadir}/jigdo/
-%{_datadir}/applications/*-jigdo.desktop
+%{_datadir}/applications/%{desktop_vendor}-jigdo.desktop
 
 %changelog
 * Wed Apr 18 2007 Ralph Angenendt <ra at br-online.de> 0.7.3-1
 - Updated to release 0.7.3.
 
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.7.1-1.2
-- Rebuild for Fedora Core 5.
-
 * Mon Dec 13 2004 Dries Verachtert <dries at ulyssis.org> - 0.7.1-1
 - Initial package.

Modified: trunk/rpms/nagios-plugins/nagios-plugins.spec
===================================================================
--- trunk/rpms/nagios-plugins/nagios-plugins.spec	2007-04-18 16:03:32 UTC (rev 5295)
+++ trunk/rpms/nagios-plugins/nagios-plugins.spec	2007-04-18 16:34:00 UTC (rev 5296)
@@ -12,26 +12,34 @@
 %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
 %define _libexecdir %{_libdir}/nagios/plugins
-%define extraplugins cluster cluster2 cpqarray hltherm http-with-client-certificate ipxping logins rbl timeout uptime
 
+%define extraplugins ide_smart ldap pgsql
+
 Summary: Host/service/network monitoring program plugins for Nagios
 Name: nagios-plugins
-Version: 1.4.6
+Version: 1.4.8
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://nagiosplug.sourceforge.net/
 
 Source: http://dl.sf.net/nagiosplug/nagios-plugins-%{version}.tar.gz
+Patch0: nagios-plugins-1.4.3-subst.patch
+Patch1: nagios-plugins-1.4.6-radius-ng.patch
+Patch2: nagios-plugins-1.4.3-ntpd.patch
+Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
+Patch4: nagios-plugins-1.4.4-linux_raid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 AutoReq: no
 #BuildRequires: nagios-devel
 #BuildRequires: bind-devel (not needed for check_dns)
-BuildRequires: gcc-c++, radiusclient-devel
+BuildRequires: gcc-c++, gettext, radiusclient-devel, python
 BuildRequires: fping, bind-utils, ntp, samba-client, openssh-clients, qstat
 BuildRequires: openldap-devel, mysql-devel, postgresql-devel
-BuildRequires: perl(Net::SNMP)
+BuildRequires: perl(Net::SNMP), apt
+BuildRequires: %{_bindir}/mailq
+#BuildRequires: radiusclient-ng-devel
 %{!?_without_net_snmp:BuildRequires: net-snmp-devel, net-snmp-utils}
 %{?_without_net_snmp:BuildRequires: ucd-snmp-devel, ucd-snmp-utils}
 
@@ -64,10 +72,12 @@
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
-### Allow non-root builds
-%{__perl} -pi.orig -e 's|^INSTALL_OPTS|#INSTALL_OPTS|' configure
-
 ### FIXME: Change to real perl and plugins location. (Please fix upstream)
 find contrib -type f -exec %{__perl} -pi -e '
 		s|^#!/.*bin/perl|#!%{__perl}|i;
@@ -76,46 +86,210 @@
 	' {} \;
 
 %build
-PATH="/sbin:/bin:/usr/sbin:/usr/sbin:$PATH" \
+PATH="/sbin:%{_sbindir}:$PATH" \
 %configure \
-	--with-cgiurl="/nagios/cgi-bin" \
-	--with-mysql="%{_prefix}" \
-	--with-pgsql="%{_prefix}"
+	--with-cgiurl="/nagios/cgi-bin"
 #	--with-nagios-user="nagios" \
 #	--with-nagios-group="nagios" \
 %{__make} %{?_smp_mflags}
 
-### Build some contrib plugins
+### Build some extra and contrib plugins
 for plugin in %{extraplugins}; do
-	${CC:-%{__cc}} %{optflags} -I. -Iplugins/ -I%{_datadir}/gettext/ -o check_$plugin contrib/check_$plugin.c || :
+	%{__make} -C plugins check_$plugin
 done
 
+for plugin in contrib/*.c; do
+	${CC:-%{__cc}} %{optflags} -I. -Iplugins/ -I%{_datadir}/gettext/ -o ${plugin%.c} $plugin || :
+done
+
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__perl} -pi -e 's|^MKINSTALLDIRS.*|MKINSTALLDIRS = ../mkinstalldirs|' po/Makefile
+%{__make} install  DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
 %find_lang %{name}
 
 %{__install} -d -m0755 %{buildroot}%{_libdir}/nagios/plugins/contrib/
-%{__install} -m0755 contrib/check* %{buildroot}%{_libdir}/nagios/plugins/contrib/
-%{__install} -m0755 check_* %{buildroot}%{_libdir}/nagios/plugins/
+%{__install} -m0755 plugins/check_* %{buildroot}%{_libdir}/nagios/plugins/
+%{__install} -m4755 plugins-root/check_* %{buildroot}%{_libdir}/nagios/plugins/
+%{__install} -m0755 contrib/check_* %{buildroot}%{_libdir}/nagios/plugins/contrib/
 
-%{__install} -m0755 plugins-root/check_{dhcp,icmp} %{buildroot}%{_libdir}/nagios/plugins/
+#%{__install} -Dp -m0644 plugins-scripts/utils.pm %{buildroot}%{perl_vendorlib}/utils.pm
+%{__install} -Dp -m0644 plugins-scripts/utils.pm %{buildroot}%{_libdir}/nagios/plugins/plugins.pm
+%{__install} -Dp -m0644 contrib/utils.py %{buildroot}%{_libdir}/nagios/plugins/utils.py
 
-%{__install} -Dp -m0644 plugins-scripts/utils.pm %{buildroot}%{perl_vendorlib}/utils.pm
 %{__install} -Dp -m0644 command.cfg %{buildroot}%{_sysconfdir}/nagios/command-plugins.cfg
 
+### Generate normal (.pyc) and optimized (.pyo) byte-compiled files.
+%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}", 10, "/", 1)' 
+%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}", 10, "/", 1)'
+
+
+### Clean up buildroot
+%{__rm} -f %{buildroot}%{_libdir}/nagios/plugins/*.{c,o}
+%{__rm} -f %{buildroot}%{_libdir}/nagios/plugins/contrib/*.orig
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %files -f %{name}.lang
 #%defattr(-, nagios, nagios, 0755)
 %defattr(-, root, root, 0755)
-%doc ACKNOWLEDGEMENTS AUTHORS BUGS ChangeLog CHANGES COPYING FAQ INSTALL
-%doc LEGAL NEWS README REQUIREMENTS SUPPORT THANKS command.cfg
+%doc ACKNOWLEDGEMENTS AUTHORS BUGS ChangeLog CODING COPYING FAQ INSTALL LEGAL
+%doc NEWS README REQUIREMENTS SUPPORT THANKS command.cfg
 %config(noreplace) %{_sysconfdir}/nagios/
 %dir %{_libdir}/nagios/
-%{_libdir}/nagios/plugins/
-%{perl_vendorlib}/utils.pm
+%dir %{_libdir}/nagios/plugins/
+%{_libdir}/nagios/plugins/check_apt
+%{_libdir}/nagios/plugins/check_breeze
+%{_libdir}/nagios/plugins/check_by_ssh
+%{_libdir}/nagios/plugins/check_clamd
+%{_libdir}/nagios/plugins/check_dig
+%{_libdir}/nagios/plugins/check_disk
+%{_libdir}/nagios/plugins/check_disk_smb
+%{_libdir}/nagios/plugins/check_dns
+%{_libdir}/nagios/plugins/check_dummy
+%{_libdir}/nagios/plugins/check_file_age
+%{_libdir}/nagios/plugins/check_flexlm
+%{_libdir}/nagios/plugins/check_fping
+%{_libdir}/nagios/plugins/check_ftp
+%{_libdir}/nagios/plugins/check_game
+%{_libdir}/nagios/plugins/check_hpjd
+%{_libdir}/nagios/plugins/check_http
+%{_libdir}/nagios/plugins/check_ide_smart
+%{_libdir}/nagios/plugins/check_ifoperstatus
+%{_libdir}/nagios/plugins/check_ifstatus
+%{_libdir}/nagios/plugins/check_imap
+%{_libdir}/nagios/plugins/check_ircd
+%{_libdir}/nagios/plugins/check_jabber
+%{_libdir}/nagios/plugins/check_ldap
+#%{_libdir}/nagios/plugins/check_ldaps
+%{_libdir}/nagios/plugins/check_load
+%{_libdir}/nagios/plugins/check_log
+%{_libdir}/nagios/plugins/check_mailq
+%{_libdir}/nagios/plugins/check_mrtg
+%{_libdir}/nagios/plugins/check_mrtgtraf
+%{_libdir}/nagios/plugins/check_mysql
+%{_libdir}/nagios/plugins/check_mysql_query
+%{_libdir}/nagios/plugins/check_nagios
+%{_libdir}/nagios/plugins/check_nntp
+%{_libdir}/nagios/plugins/check_nntps
+%{_libdir}/nagios/plugins/check_nt
+%{_libdir}/nagios/plugins/check_ntp
+%{_libdir}/nagios/plugins/check_nwstat
+%{_libdir}/nagios/plugins/check_oracle
+%{_libdir}/nagios/plugins/check_overcr
+%{_libdir}/nagios/plugins/check_pgsql
+%{_libdir}/nagios/plugins/check_ping
+%{_libdir}/nagios/plugins/check_pop
+%{_libdir}/nagios/plugins/check_procs
+#%{_libdir}/nagios/plugins/check_radius
+%{_libdir}/nagios/plugins/check_real
+%{_libdir}/nagios/plugins/check_rpc
+%{_libdir}/nagios/plugins/check_sensors
+%{_libdir}/nagios/plugins/check_simap
+%{_libdir}/nagios/plugins/check_smtp
+%{_libdir}/nagios/plugins/check_snmp
+%{_libdir}/nagios/plugins/check_spop
+%{_libdir}/nagios/plugins/check_ssh
+%{_libdir}/nagios/plugins/check_ssmtp
+%{_libdir}/nagios/plugins/check_swap
+%{_libdir}/nagios/plugins/check_tcp
+%{_libdir}/nagios/plugins/check_time
+%{_libdir}/nagios/plugins/check_udp
+%{_libdir}/nagios/plugins/check_ups
+%{_libdir}/nagios/plugins/check_users
+%{_libdir}/nagios/plugins/check_wave
+%dir %{_libdir}/nagios/plugins/contrib/
+%{_libdir}/nagios/plugins/contrib/check_adptraid.sh
+%{_libdir}/nagios/plugins/contrib/check_apache.pl
+%{_libdir}/nagios/plugins/contrib/check_apc_ups.pl
+%{_libdir}/nagios/plugins/contrib/check_appletalk.pl
+%{_libdir}/nagios/plugins/contrib/check_arping.pl
+%{_libdir}/nagios/plugins/contrib/check_asterisk.pl
+%{_libdir}/nagios/plugins/contrib/check_axis.sh
+%{_libdir}/nagios/plugins/contrib/check_backup.pl
+%{_libdir}/nagios/plugins/contrib/check_bgpstate.pl
+%{_libdir}/nagios/plugins/contrib/check_breeze.pl
+%{_libdir}/nagios/plugins/contrib/check_cluster
+%{_libdir}/nagios/plugins/contrib/check_cluster.c
+%{_libdir}/nagios/plugins/contrib/check_cluster2
+%{_libdir}/nagios/plugins/contrib/check_cluster2.c
+%{_libdir}/nagios/plugins/contrib/check_compaq_insight.pl
+%{_libdir}/nagios/plugins/contrib/check_cpqarray.c
+%{_libdir}/nagios/plugins/contrib/check_digitemp.pl
+%{_libdir}/nagios/plugins/contrib/check_dlswcircuit.pl
+%{_libdir}/nagios/plugins/contrib/check_dns_random.pl
+%{_libdir}/nagios/plugins/contrib/check_email_loop.pl
+%{_libdir}/nagios/plugins/contrib/check_fan_cpq_present
+%{_libdir}/nagios/plugins/contrib/check_fan_fsc_present
+%{_libdir}/nagios/plugins/contrib/check_flexlm.pl
+%{_libdir}/nagios/plugins/contrib/check_frontpage
+%{_libdir}/nagios/plugins/contrib/check_hltherm.c
+%{_libdir}/nagios/plugins/contrib/check_hprsc.pl
+%{_libdir}/nagios/plugins/contrib/check_http-with-client-certificate.c
+%{_libdir}/nagios/plugins/contrib/check_hw.sh
+%{_libdir}/nagios/plugins/contrib/check_ica_master_browser.pl
+%{_libdir}/nagios/plugins/contrib/check_ica_metaframe_pub_apps.pl
+%{_libdir}/nagios/plugins/contrib/check_ica_program_neigbourhood.pl
+%{_libdir}/nagios/plugins/contrib/check_inodes-freebsd.pl
+%{_libdir}/nagios/plugins/contrib/check_inodes.pl
+%{_libdir}/nagios/plugins/contrib/check_ipxping.c
+%{_libdir}/nagios/plugins/contrib/check_javaproc.pl
+%{_libdir}/nagios/plugins/contrib/check_joy.sh
+%{_libdir}/nagios/plugins/contrib/check_linux_raid.pl
+%{_libdir}/nagios/plugins/contrib/check_lmmon.pl
+%{_libdir}/nagios/plugins/contrib/check_log2.pl
+%{_libdir}/nagios/plugins/contrib/check_lotus.pl
+%{_libdir}/nagios/plugins/contrib/check_maxchannels.pl
+%{_libdir}/nagios/plugins/contrib/check_maxwanstate.pl
+%{_libdir}/nagios/plugins/contrib/check_mem.pl
+%{_libdir}/nagios/plugins/contrib/check_ms_spooler.pl
+%{_libdir}/nagios/plugins/contrib/check_mssql.sh
+%{_libdir}/nagios/plugins/contrib/check_nagios.pl
+%{_libdir}/nagios/plugins/contrib/check_nagios_db.pl
+%{_libdir}/nagios/plugins/contrib/check_nagios_db_pg.pl
+%{_libdir}/nagios/plugins/contrib/check_netapp.pl
+%{_libdir}/nagios/plugins/contrib/check_nmap.py
+%{_libdir}/nagios/plugins/contrib/check_nmap.pyc
+%ghost %{_libdir}/nagios/plugins/contrib/check_nmap.pyo
+%{_libdir}/nagios/plugins/contrib/check_ora_table_space.pl
+%{_libdir}/nagios/plugins/contrib/check_oracle_instance.pl
+%{_libdir}/nagios/plugins/contrib/check_oracle_tbs
+%{_libdir}/nagios/plugins/contrib/check_pcpmetric.py
+%{_libdir}/nagios/plugins/contrib/check_pcpmetric.pyc
+%ghost %{_libdir}/nagios/plugins/contrib/check_pcpmetric.pyo
+%{_libdir}/nagios/plugins/contrib/check_pfstate
+%{_libdir}/nagios/plugins/contrib/check_qmailq.pl
+%{_libdir}/nagios/plugins/contrib/check_rbl.c
+%{_libdir}/nagios/plugins/contrib/check_remote_nagios_status.pl
+%{_libdir}/nagios/plugins/contrib/check_rrd_data.pl
+%{_libdir}/nagios/plugins/contrib/check_sap.sh
+%{_libdir}/nagios/plugins/contrib/check_smart.pl
+%{_libdir}/nagios/plugins/contrib/check_smb.sh
+%{_libdir}/nagios/plugins/contrib/check_snmp_disk_monitor.pl
+%{_libdir}/nagios/plugins/contrib/check_snmp_printer.pl
+%{_libdir}/nagios/plugins/contrib/check_snmp_process_monitor.pl
+%{_libdir}/nagios/plugins/contrib/check_snmp_procs.pl
+%{_libdir}/nagios/plugins/contrib/check_sockets.pl
+%{_libdir}/nagios/plugins/contrib/check_temp_cpq
+%{_libdir}/nagios/plugins/contrib/check_temp_fsc
+%{_libdir}/nagios/plugins/contrib/check_timeout
+%{_libdir}/nagios/plugins/contrib/check_timeout.c
+%{_libdir}/nagios/plugins/contrib/check_traceroute-pure_perl.pl
+%{_libdir}/nagios/plugins/contrib/check_traceroute.pl
+%{_libdir}/nagios/plugins/contrib/check_uptime.c
+%{_libdir}/nagios/plugins/contrib/check_vcs.pl
+%{_libdir}/nagios/plugins/contrib/check_wave.pl
+%{_libdir}/nagios/plugins/contrib/check_wins.pl
+%{_libdir}/nagios/plugins/negate
+%{_libdir}/nagios/plugins/plugins.pm
+%{_libdir}/nagios/plugins/urlize
+%{_libdir}/nagios/plugins/utils.pm
+%{_libdir}/nagios/plugins/utils.py
+%{_libdir}/nagios/plugins/utils.pyc
+%ghost %{_libdir}/nagios/plugins/utils.pyo
+%{_libdir}/nagios/plugins/utils.sh
+#%{perl_vendorlib}/utils.pm
 %exclude %{_libdir}/nagios/plugins/check_dhcp
 %exclude %{_libdir}/nagios/plugins/check_icmp
 
@@ -127,6 +301,9 @@
 %{_libdir}/nagios/plugins/check_icmp
 
 %changelog
+* Wed Apr 18 2007 Dag Wieers <dag at wieers.com> - 1.4.8-1
+- Updated to release 1.4.8.
+
 * Wed Mar 14 2007 Dag Wieers <dag at wieers.com> - 1.4.6-1
 - Updated to release 1.4.6.

More information about the svn-commits mailing list