[Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.22,1.23 nagios-plugins.spec.in,1.11,1.12

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13356

Modified Files:
	Makefile.am nagios-plugins.spec.in 
Log Message:
make specfile into a template which can generate a generic spec plus specs suitable for various repositories

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Makefile.am	18 Dec 2003 09:19:10 -0000	1.22
--- Makefile.am	2 Mar 2004 06:17:53 -0000	1.23
***************
*** 13,17 ****
  
  dist-hook:
! 	make THANKS nagios-plugins.spec
  
  test:
--- 13,17 ----
  
  dist-hook:
! 	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
  
  test:
***************
*** 20,24 ****
  
  nagios-plugins.spec: nagios-plugins.spec.in
! 	sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $? > $@
  
  # Solaris pkgmk
--- 20,28 ----
  
  nagios-plugins.spec: nagios-plugins.spec.in
! 	sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
! 
! pkg/fedora/nagios-plugins.spec: nagios-plugins.spec.in
! 	$(top_srcdir)/mkinstalldirs pkg/fedora
! 	sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;/^# Requires$$/r $(top_srcdir)/pkg/fedora/requires" $? > $@
  
  # Solaris pkgmk

Index: nagios-plugins.spec.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/nagios-plugins.spec.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** nagios-plugins.spec.in	1 Dec 2003 02:38:13 -0000	1.11
--- nagios-plugins.spec.in	2 Mar 2004 06:17:53 -0000	1.12
***************
*** 1,62 ****
! %{!?custom:%global custom 0}
! 
! %define archive nagios-plugins
  
! %if %custom
! %define name %{archive}-custom
! %else
! %define name %{archive}
! %endif
  
- %define version %%{VERSION}
- %define release %%{RELEASE}
- %define source %{archive}-%{version}
- 
- Name: %{name}
- Version: %{version}
- Release: %{release}
- Copyright: GPL
- Source: %{source}.tar.gz
- BuildRoot: %{_tmppath}/%{name}-buildroot
  Prefix: %{_prefix}/lib/nagios/plugins
  Packager: Karl DeBisschop <kdebisschop at users.sourceforge.net>
  Vendor: Nagios Plugin Development Group
  Provides: nagios-plugins
- %if %custom
- Obsoletes: nagios-plugins nagios-plugins-extras
- %else
- Obsoletes: nagios-plugins-custom
- %endif
- AutoReqProv: no
- Summary: Host/service/network monitoring program plugins for Nagios
- Group: Applications/System
  
! #BuildRequires: nagios-devel
! #BuildRequires: postgresql-devel, openssl-devel, bind-devel, openldap-devel, mysql-devel
! #BuildRequires: perl(Net::SNMP), %{?rh73:, ucd-snmp-devel} %{?rh80:, net-snmp-devel} %{?rh90:, net-snmp-devel}
! #BuildRequires: fping, bind-utils, ntp, samba-client, openssh-clients, radiusclient-devel
! #BuildRequires: qstat
! 
! #Requires: perl, perl(Net::SNMP), openssl
! 
! %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
! resolved. Nagios runs on a unix server as a background or daemon
! process, intermittently running checks on various services that you
! specify. The actual service checks are performed by separate "plugin"
! programs which return the status of the checks to Nagios.
  
- This package contains the basic plugins necessary for use with the
- Nagios package.  This package should install cleanly on almost any
- RPM-based system.
  
  
- %package extras
- Summary: Plugins which depend on the presence of other packages
- Group: Applications/System
  
! %description extras
  
  Nagios is a program that will monitor hosts and services on your
--- 1,26 ----
! Name: nagios-plugins
! Version: %%{VERSION}
! Release: %%{RELEASE}
! 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.gz
! BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  Prefix: %{_prefix}/lib/nagios/plugins
  Packager: Karl DeBisschop <kdebisschop at users.sourceforge.net>
  Vendor: Nagios Plugin Development Group
  Provides: nagios-plugins
  
! %{!?custom:%global custom 0}
! Obsoletes: nagios-plugins-custom nagios-plugins-extras
  
  
+ # Requires
  
  
! %description
  
  Nagios is a program that will monitor hosts and services on your
***************
*** 65,83 ****
  process, intermittently running checks on various services that you
  specify. The actual service checks are performed by separate "plugin"
! programs which return the status of the checks to Nagios.
! 
! This package contains plugins which use additional libraries or system
! calls that are not installed on all systems.  As a result, most users
! will need to install the '--nodeps' option when invoking `rpm`
! 
! #Requires: fping, openldap, mysql, postgresql-libs
  
  
  %prep
! %setup -q -n %{source}
  
  
  %build
! CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
  --prefix=%{_prefix} \
  --exec-prefix=%{_exec_prefix} \
--- 29,42 ----
  process, intermittently running checks on various services that you
  specify. The actual service checks are performed by separate "plugin"
! programs which return the status of the checks to Nagios. This package
! contains those plugins.
  
  
  %prep
! %setup -q
  
  
  %build
! ./configure \
  --prefix=%{_prefix} \
  --exec-prefix=%{_exec_prefix} \
***************
*** 86,96 ****
  --datadir=%{_datadir} \
  --with-cgiurl=/nagios/cgi-bin
! make 
  
  
  %install
  make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install
  install -d ${RPM_BUILD_ROOT}/etc/nagios
  install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios
  
  %clean
--- 45,58 ----
  --datadir=%{_datadir} \
  --with-cgiurl=/nagios/cgi-bin
! make %{?_smp_mflags}
  
  
  %install
+ rm -rf $RPM_BUILD_ROOT
  make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install
  install -d ${RPM_BUILD_ROOT}/etc/nagios
  install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios
+ %find_lang %{name}
+ 
  
  %clean
***************
*** 98,102 ****
  
  
! %files
  %defattr(-,root,root)
  %config(missingok,noreplace) /etc/nagios/command.cfg
--- 60,64 ----
  
  
! %files -f %{name}.lang
  %defattr(-,root,root)
  %config(missingok,noreplace) /etc/nagios/command.cfg
***************
*** 107,113 ****
--- 69,79 ----
  %{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo
  %{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo
+ 
  %if %custom
+ 
  %{_exec_prefix}/lib/nagios/plugins/*
+ 
  %else
+ 
  %{_exec_prefix}/lib/nagios/plugins/check_by_ssh
  %{_exec_prefix}/lib/nagios/plugins/check_breeze
***************
*** 156,164 ****
  %{_exec_prefix}/lib/nagios/plugins/urlize
  %{_exec_prefix}/lib/nagios/plugins/check_file_age
- %endif
- 
- %if ! %custom
- %files extras
- %defattr(775,root,root)
  %{_exec_prefix}/lib/nagios/plugins/check_fping
  %{_exec_prefix}/lib/nagios/plugins/check_game
--- 122,125 ----
***************
*** 173,221 ****
  
  %changelog
! * Wed Jan 17 2001 Karl DeBisschop <karl at debisschop.net> (1.2.9-1)
! - switch from /usr/libexec to /usr/lib because FHS has no libexec
! - use 'custom' macro define to merge with nagios-plugins-custom spec
! - add check_game to extras
! 
! * Mon Jun 26 2000 Karl DeBisschop <karl at debisschop.net>
! - Release 1.2.8-4 (check_ping bug fix)
! - use bzip2 insted of gzip for mandrake compatibility
! 
! * Thu Jun 22 2000 Karl DeBisschop <karl at debisschop.net>
! - Release 1.2.8-3 (bug fixes)
! - Add macros to spec where possible
! 
! * Fri Jun 16 2000 Karl DeBisschop <karl at debisschop.net>
! - Release 1.2.8-2 (bug fixes)
! 
! * Fri Jun 09 2000 Karl DeBisschop <karl at debisschop.net>
! - Release to 1.2.8
! 
! * Wed Jun 07 2000 Karl DeBisschop <karl at debisschop.net>
! - Upgrade to 1.2.8pre7
! 
! * Sat Jun 03 2000 Karl DeBisschop <karl at debisschop.net>
! - Upgraded to 1.2.8pre5
! - use RPM_OPT_FALGS to set compiler options
! - cahneg group to Applications/System
! 
! * Fri May 19 2000 Karl DeBisschop <karl at debisschop.net>
! - Upgraded to 1.2.8pre3 (release-3)
! 
! * Mon Mar 20 2000 Karl DeBisschop <karl at debisschop.net>
! - Upgraded to 1.2.8b2
! 
! * Tue Dec 14 1999 Adam Jacob <adam at cybertrails.com> (1.2.7-1cvs)
! - Upgraded package from 1.2.6 to 1.2.7 from the latest CVS code
! - Modified SPEC file to contain the proper build_root stuff. :)
! 
! * Tue Oct 19 1999 Mike McHenry <mmchen at minn.net> (1.2.6)
! - Upgraded package from 1.2.4 to 1.2.6
! - Resolved dependancy issue with libpq.so
! - Added support for check_fping
! 
! * Fri Sep 03 1999 Mike McHenry <mmchen at minn.net> (1.2.4)
! - Upgraded package from 1.2.2 to 1.2.4
! 
! * Mon Aug 16 1999 Mike McHenry <mmchen at minn.net> (1.2.2)
! - First RPM build (1.2.2)
--- 134,137 ----
  
  %changelog
! * Tue Mar 04 2004 Karl DeBisschop <karl[AT]debisschop.net> - 1.4.0alpha1
! - extensive rewrite to facilitate processing into various distro-compatible specs