[Nagiosplug-checkins] CVS: nagiosplug .cvsignore,1.7,1.8 ChangeLog,1.3,1.4 Makefile.am,1.17,1.18 configure.in,1.86,1.87 nagios-plugins.spec.in,1.9,1.10

Karl DeBisschop kdebisschop at users.sourceforge.net
Sat Jul 26 15:25:01 CEST 2003


Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv31307

Modified Files:
	.cvsignore ChangeLog Makefile.am configure.in 
	nagios-plugins.spec.in 
Log Message:
checkins for internationalization

Index: .cvsignore
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** .cvsignore	25 Mar 2003 06:33:02 -0000	1.7
--- .cvsignore	26 Jul 2003 04:06:32 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
  Cache.pm
  build-*
+ intl
  aclocal.m4
  autom4te*.cache

Index: ChangeLog
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ChangeLog	2 Mar 2003 04:59:48 -0000	1.3
--- ChangeLog	26 Jul 2003 04:06:32 -0000	1.4
***************
*** 1,2 ****
--- 1,8 ----
+ 2003-07-02  gettextize  <bug-gnu-gettext at gnu.org>
+ 
+ 	* Makefile.am (SUBDIRS): Add intl.
+ 	(EXTRA_DIST): Add config.rpath.
+ 	* configure.in (AC_OUTPUT): Add intl/Makefile,
+ 
  2003-03-02  kdebisschop at alert.infoplease.com  <kdebisschop>
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** Makefile.am	14 May 2003 21:39:48 -0000	1.17
--- Makefile.am	26 Jul 2003 04:06:32 -0000	1.18
***************
*** 1,13 ****
  ## Process this file with automake to produce Makefile.in
  
! SUBDIRS = lib plugins plugins-scripts
  
! EXTRA_DIST = CODING FAQ LEGAL REQUIREMENTS SUPPORT \
  	Helper.pm contrib pkg nagios-plugins.spec.in
  
  ACLOCAL_AMFLAGS = -I lib
  
  dist-hook:
! 	sed "s/%%{VER}/${VER}/;s/%%{REL}/${REL}/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
  
  test:
--- 1,17 ----
  ## Process this file with automake to produce Makefile.in
  
! SUBDIRS = intl lib plugins plugins-scripts po
  
! EXTRA_DIST = config.rpath \
! 	ABOUT-NLS CODING FAQ LEGAL REQUIREMENTS SUPPORT \
  	Helper.pm contrib pkg nagios-plugins.spec.in
  
  ACLOCAL_AMFLAGS = -I lib
  
+ localedir = $(datadir)/locale
+ DEFS = -DLOCALEDIR=\"$(localedir)\"
+ 
  dist-hook:
! 	sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $(srcdir)/nagios-plugins.spec.in > $(distdir)/nagios-plugins.spec
  
  test:
***************
*** 16,20 ****
  
  nagios-plugins.spec: nagios-plugins.spec.in
! 	sed "s/%%{VER}/${VER}/;s/%%{REL}/${REL}/;" $? > $@
  
  # Solaris pkgmk
--- 20,24 ----
  
  nagios-plugins.spec: nagios-plugins.spec.in
! 	sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;" $? > $@
  
  # Solaris pkgmk

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** configure.in	21 Jul 2003 11:53:25 -0000	1.86
--- configure.in	26 Jul 2003 04:06:32 -0000	1.87
***************
*** 2,22 ****
  AC_REVISION ($Revision$)
  AC_PREREQ(2.50)
! AC_INIT(Helper.pm)
! VER=1.3.99
! REL=1
! AC_SUBST(VER)
! AC_SUBST(REL)
! PACKAGE_VERSION="${VER}"
! AC_SUBST(PACKAGE_VERSION)
! PACKAGE_RELEASE="${REL}"
! AC_SUBST(PACKAGE_RELEASE)
! AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
  AM_CONFIG_HEADER(plugins/config.h)
  AC_CANONICAL_HOST
  
  AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  dnl Figure out how to invoke "install" and what install options to use.
- 
  AC_PROG_INSTALL
  AC_SUBST(INSTALL)
--- 2,17 ----
  AC_REVISION ($Revision$)
  AC_PREREQ(2.50)
! AC_INIT(nagios-plugins,1.3.99)
! AC_CONFIG_SRCDIR(Helper.pm)
! AM_INIT_AUTOMAKE
  AM_CONFIG_HEADER(plugins/config.h)
  AC_CANONICAL_HOST
  
+ RELEASE=1
+ AC_SUBST(RELEASE)
+ 
  AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  dnl Figure out how to invoke "install" and what install options to use.
  AC_PROG_INSTALL
  AC_SUBST(INSTALL)
***************
*** 1395,1401 ****
  AC_SUBST(DEPLIBS)
  
! AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}",[package version])
  
! AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo)
  
  ACX_FEATURE([with],[cgiurl])
--- 1390,1397 ----
  AC_SUBST(DEPLIBS)
  
! GETTEXT_VERSION=0.11.4
! AM_GNU_GETTEXT
  
! AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo intl/Makefile po/Makefile.in )
  
  ACX_FEATURE([with],[cgiurl])

Index: nagios-plugins.spec.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/nagios-plugins.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** nagios-plugins.spec.in	17 Apr 2003 05:56:16 -0000	1.9
--- nagios-plugins.spec.in	26 Jul 2003 04:06:32 -0000	1.10
***************
*** 9,14 ****
  %endif
  
! %define version %%{VER}
! %define release %%{REL}
  %define source %{archive}-%{version}
  
--- 9,14 ----
  %endif
  
! %define version %%{VERSION}
! %define release %%{RELEASE}
  %define source %{archive}-%{version}
  
***************
*** 70,75 ****
  %build
  CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
! --prefix=%{_prefix}/lib/nagios/plugins \
! --libexecdir=%{_prefix}/lib/nagios/plugins \
  --with-cgiurl=/nagios/cgi-bin
  make
--- 70,78 ----
  %build
  CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
! --prefix=%{_prefix} \
! --exec-prefix=%{_exec_prefix} \
! --libexecdir=%{_exec_prefix}/lib/nagios/plugins \
! --sysconfdir=%{_sysconfdir}/nagios \
! --datadir=%{_datadir} \
  --with-cgiurl=/nagios/cgi-bin
  make
***************
*** 91,143 ****
  %doc ChangeLog command.cfg
  %defattr(775,root,root)
! %dir %{_prefix}/lib/nagios/plugins
  %if %custom
! %{_prefix}/lib/nagios/plugins/*
  %else
! %{_prefix}/lib/nagios/plugins/check_by_ssh
! %{_prefix}/lib/nagios/plugins/check_breeze
! %{_prefix}/lib/nagios/plugins/check_dig
! %{_prefix}/lib/nagios/plugins/check_disk
! %{_prefix}/lib/nagios/plugins/check_disk_smb
! %{_prefix}/lib/nagios/plugins/check_dns
! %{_prefix}/lib/nagios/plugins/check_dummy
! %{_prefix}/lib/nagios/plugins/check_flexlm
! %{_prefix}/lib/nagios/plugins/check_ftp
! %{_prefix}/lib/nagios/plugins/check_http
! %{_prefix}/lib/nagios/plugins/check_ifoperstatus
! %{_prefix}/lib/nagios/plugins/check_ifstatus
! %{_prefix}/lib/nagios/plugins/check_imap
! %{_prefix}/lib/nagios/plugins/check_ircd
! %{_prefix}/lib/nagios/plugins/check_load
! %{_prefix}/lib/nagios/plugins/check_log
! %{_prefix}/lib/nagios/plugins/check_mailq
! %{_prefix}/lib/nagios/plugins/check_mrtg
! %{_prefix}/lib/nagios/plugins/check_mrtgtraf
! %{_prefix}/lib/nagios/plugins/check_nagios
! %{_prefix}/lib/nagios/plugins/check_nntp
! %{_prefix}/lib/nagios/plugins/check_nt
! %{_prefix}/lib/nagios/plugins/check_ntp
! %{_prefix}/lib/nagios/plugins/check_nwstat
! %{_prefix}/lib/nagios/plugins/check_oracle
! %{_prefix}/lib/nagios/plugins/check_overcr
! %{_prefix}/lib/nagios/plugins/check_ping
! %{_prefix}/lib/nagios/plugins/check_pop
! %{_prefix}/lib/nagios/plugins/check_procs
! %{_prefix}/lib/nagios/plugins/check_real
! %{_prefix}/lib/nagios/plugins/check_rpc
! %{_prefix}/lib/nagios/plugins/check_sensors
! %{_prefix}/lib/nagios/plugins/check_smtp
! %{_prefix}/lib/nagios/plugins/check_ssh
! %{_prefix}/lib/nagios/plugins/check_swap
! %{_prefix}/lib/nagios/plugins/check_tcp
! %{_prefix}/lib/nagios/plugins/check_time
! %{_prefix}/lib/nagios/plugins/check_udp
! %{_prefix}/lib/nagios/plugins/check_ups
! %{_prefix}/lib/nagios/plugins/check_users
! %{_prefix}/lib/nagios/plugins/check_wave
! %{_prefix}/lib/nagios/plugins/negate
! %{_prefix}/lib/nagios/plugins/utils.pm
! %{_prefix}/lib/nagios/plugins/utils.sh
! %{_prefix}/lib/nagios/plugins/urlize
  %endif
  
--- 94,149 ----
  %doc ChangeLog command.cfg
  %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
  %if %custom
! %{_exec_prefix}/lib/nagios/plugins/*
  %else
! %{_exec_prefix}/lib/nagios/plugins/check_by_ssh
! %{_exec_prefix}/lib/nagios/plugins/check_breeze
! %{_exec_prefix}/lib/nagios/plugins/check_dig
! %{_exec_prefix}/lib/nagios/plugins/check_disk
! %{_exec_prefix}/lib/nagios/plugins/check_disk_smb
! %{_exec_prefix}/lib/nagios/plugins/check_dns
! %{_exec_prefix}/lib/nagios/plugins/check_dummy
! %{_exec_prefix}/lib/nagios/plugins/check_flexlm
! %{_exec_prefix}/lib/nagios/plugins/check_ftp
! %{_exec_prefix}/lib/nagios/plugins/check_http
! %{_exec_prefix}/lib/nagios/plugins/check_ifoperstatus
! %{_exec_prefix}/lib/nagios/plugins/check_ifstatus
! %{_exec_prefix}/lib/nagios/plugins/check_imap
! %{_exec_prefix}/lib/nagios/plugins/check_ircd
! %{_exec_prefix}/lib/nagios/plugins/check_load
! %{_exec_prefix}/lib/nagios/plugins/check_log
! %{_exec_prefix}/lib/nagios/plugins/check_mailq
! %{_exec_prefix}/lib/nagios/plugins/check_mrtg
! %{_exec_prefix}/lib/nagios/plugins/check_mrtgtraf
! %{_exec_prefix}/lib/nagios/plugins/check_nagios
! %{_exec_prefix}/lib/nagios/plugins/check_nntp
! %{_exec_prefix}/lib/nagios/plugins/check_nt
! %{_exec_prefix}/lib/nagios/plugins/check_ntp
! %{_exec_prefix}/lib/nagios/plugins/check_nwstat
! %{_exec_prefix}/lib/nagios/plugins/check_oracle
! %{_exec_prefix}/lib/nagios/plugins/check_overcr
! %{_exec_prefix}/lib/nagios/plugins/check_ping
! %{_exec_prefix}/lib/nagios/plugins/check_pop
! %{_exec_prefix}/lib/nagios/plugins/check_procs
! %{_exec_prefix}/lib/nagios/plugins/check_real
! %{_exec_prefix}/lib/nagios/plugins/check_rpc
! %{_exec_prefix}/lib/nagios/plugins/check_sensors
! %{_exec_prefix}/lib/nagios/plugins/check_smtp
! %{_exec_prefix}/lib/nagios/plugins/check_ssh
! %{_exec_prefix}/lib/nagios/plugins/check_swap
! %{_exec_prefix}/lib/nagios/plugins/check_tcp
! %{_exec_prefix}/lib/nagios/plugins/check_time
! %{_exec_prefix}/lib/nagios/plugins/check_udp
! %{_exec_prefix}/lib/nagios/plugins/check_ups
! %{_exec_prefix}/lib/nagios/plugins/check_users
! %{_exec_prefix}/lib/nagios/plugins/check_wave
! %{_exec_prefix}/lib/nagios/plugins/negate
! %{_exec_prefix}/lib/nagios/plugins/utils.pm
! %{_exec_prefix}/lib/nagios/plugins/utils.sh
! %{_exec_prefix}/lib/nagios/plugins/urlize
! %{_exec_prefix}/lib/nagios/plugins/check_file_age
  %endif
  
***************
*** 145,156 ****
  %files extras
  %defattr(775,root,root)
! %{_prefix}/lib/nagios/plugins/check_fping
! %{_prefix}/lib/nagios/plugins/check_game
! %{_prefix}/lib/nagios/plugins/check_ldap
! %{_prefix}/lib/nagios/plugins/check_mysql
! %{_prefix}/lib/nagios/plugins/check_pgsql
! %{_prefix}/lib/nagios/plugins/check_radius
! %{_prefix}/lib/nagios/plugins/check_snmp
! %{_prefix}/lib/nagios/plugins/check_hpjd
  
  %endif
--- 151,162 ----
  %files extras
  %defattr(775,root,root)
! %{_exec_prefix}/lib/nagios/plugins/check_fping
! %{_exec_prefix}/lib/nagios/plugins/check_game
! %{_exec_prefix}/lib/nagios/plugins/check_ldap
! %{_exec_prefix}/lib/nagios/plugins/check_mysql
! %{_exec_prefix}/lib/nagios/plugins/check_pgsql
! %{_exec_prefix}/lib/nagios/plugins/check_radius
! %{_exec_prefix}/lib/nagios/plugins/check_snmp
! %{_exec_prefix}/lib/nagios/plugins/check_hpjd
  
  %endif





More information about the Commits mailing list