[icinga-checkins] icinga.org: icinga-nrpe/master: update package information

git at icinga.org git at icinga.org
Wed Nov 23 15:30:09 CET 2011


Module: icinga-nrpe
Branch: master
Commit: 77fb5898dc762211b2821b7b4633f5be87247768
URL:    https://git.icinga.org/?p=icinga-nrpe.git;a=commit;h=77fb5898dc762211b2821b7b4633f5be87247768

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 23 15:28:48 2011 +0100

update package information

---

 configure    |   39 ++++++++++++++++++++++++++++++++++-----
 configure.in |   29 ++++++++++++++++++++++++++---
 nrpe.spec    |    8 ++++++--
 3 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index dcd70a6..3a9abd8 100755
--- a/configure
+++ b/configure
@@ -608,6 +608,9 @@ cacert_file
 cert_file
 pidfile
 init_dir
+TARGET_ARCH
+TARGET_OS
+TARGET_VER
 NAGIOS_INSTALL_OPTS
 icinga_group
 icinga_user
@@ -644,6 +647,10 @@ INSTALL
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+PKG_REL_DATE
+PKG_HOME_URL
+PKG_VERSION
+PKG_NAME
 target_alias
 host_alias
 build_alias
@@ -2358,11 +2365,15 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 
-PKG_NAME=nrpe
+PKG_NAME=icinga-nrpe
 PKG_VERSION="3.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="10-05-2011"
 
+
+
+
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -4971,6 +4982,24 @@ fi
 NAGIOS_INSTALL_OPTS="-o $icinga_user -g $icinga_group"
 
 
+if test "x$target_ver" = "x" ; then
+	TARGET_VER=`uname -r`
+else
+	TARGET_VER=$target_ver
+fi
+
+if test "x$target_os" = "x" ; then
+	TARGET_OS=`uname -s`
+else
+	TARGET_OS=$target_os
+fi
+
+if test "x$target_cpu" = "x" ; then
+	TARGET_ARCH=`uname -p`
+else
+	TARGET_ARCH=$target_cpu
+fi
+
 
 # Check whether --enable-command-args was given.
 if test "${enable_command_args+set}" = set; then :
@@ -6316,10 +6345,10 @@ $as_echo " NRPE port:    $nrpe_port" >&6; }
 $as_echo " NRPE user:    $nrpe_user" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:  NRPE group:   $nrpe_group" >&5
 $as_echo " NRPE group:   $nrpe_group" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:  Nagios user:  $icinga_user" >&5
-$as_echo " Nagios user:  $icinga_user" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:  Nagios group: $icinga_group" >&5
-$as_echo " Nagios group: $icinga_group" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:  Icinga user:  $icinga_user" >&5
+$as_echo " Icinga user:  $icinga_user" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:  Icinga group: $icinga_group" >&5
+$as_echo " Icinga group: $icinga_group" >&6; }
 
 
 echo ""
diff --git a/configure.in b/configure.in
index 05eee97..4003d4d 100644
--- a/configure.in
+++ b/configure.in
@@ -8,10 +8,14 @@ AC_INIT(src/nrpe.c)
 AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
-PKG_NAME=nrpe
+PKG_NAME=icinga-nrpe
 PKG_VERSION="3.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="10-05-2011"
+AC_SUBST(PKG_NAME)
+AC_SUBST(PKG_VERSION)
+AC_SUBST(PKG_HOME_URL)
+AC_SUBST(PKG_REL_DATE)
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
@@ -349,6 +353,25 @@ AC_SUBST(icinga_group)
 NAGIOS_INSTALL_OPTS="-o $icinga_user -g $icinga_group"
 AC_SUBST(NAGIOS_INSTALL_OPTS)
 
+dnl Determine target OS, version and architecture for package build macros
+if test "x$target_ver" = "x" ; then
+	TARGET_VER=`uname -r`
+else
+	TARGET_VER=$target_ver
+fi
+AC_SUBST(TARGET_VER)
+if test "x$target_os" = "x" ; then
+	TARGET_OS=`uname -s`
+else
+	TARGET_OS=$target_os
+fi
+AC_SUBST(TARGET_OS)
+if test "x$target_cpu" = "x" ; then
+	TARGET_ARCH=`uname -p`
+else
+	TARGET_ARCH=$target_cpu
+fi
+AC_SUBST(TARGET_ARCH)
 
 AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS))
 
@@ -409,8 +432,8 @@ echo " -------------------------"
 AC_MSG_RESULT([ NRPE port:    $nrpe_port])
 AC_MSG_RESULT([ NRPE user:    $nrpe_user])
 AC_MSG_RESULT([ NRPE group:   $nrpe_group])
-AC_MSG_RESULT([ Nagios user:  $icinga_user])
-AC_MSG_RESULT([ Nagios group: $icinga_group])
+AC_MSG_RESULT([ Icinga user:  $icinga_user])
+AC_MSG_RESULT([ Icinga group: $icinga_group])
 
 
 echo ""
diff --git a/nrpe.spec b/nrpe.spec
index 927ae1e..5067585 100644
--- a/nrpe.spec
+++ b/nrpe.spec
@@ -1,4 +1,4 @@
-%define name nrpe
+%define name icinga-nrpe
 %define version 3.0-dev
 %define release 1
 %define nsusr icinga
@@ -12,7 +12,7 @@
 # Macro that print mesages to syslog at package (un)install time
 %define nnmmsg logger -t %{name}/rpm
 
-Summary: Host/service/network monitoring agent for Nagios
+Summary: Host/service/network monitoring agent for Icinga/Nagios
 URL: http://www.icinga.org
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,8 @@ Prefix: /etc/init.d
 Prefix: /etc/icinga
 Requires: bash, grep, nagios-plugins
 PreReq: /usr/bin/logger, chkconfig, sh-utils, shadow-utils, sed, initscripts, fileutils, mktemp
+# make sure we don't interfere with nagios-nrpe
+Conflicts: nrpe
 
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
@@ -40,6 +42,8 @@ This package provides the core agent.
 Group: Application/System
 Summary: Provides nrpe plugin for Nagios.
 Requires: nagios-plugins
+# make sure we don't interfere with nagios-nrpe
+Conflicts: nrpe
 
 %description plugin
 Nrpe is a system daemon that will execute various Nagios plugins





More information about the icinga-checkins mailing list