[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: use redhat init script on redhat rpm builds

git at icinga.org git at icinga.org
Wed May 19 11:46:56 CEST 2010


Module: icinga-core
Branch: mfriedrich/core
Commit: e290d8d8ab6bc107df4da8128315225664d9a63a
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e290d8d8ab6bc107df4da8128315225664d9a63a

Author: Christoph Maser <cmr at financial.com>
Date:   Wed May 19 11:19:17 2010 +0200

use redhat init script on redhat rpm builds
fixes #387
refs #249 on redhat

---

 daemon-init-redhat.in |    3 +--
 icinga.spec           |    9 +++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/daemon-init-redhat.in b/daemon-init-redhat.in
index 65c4304..26b0a78 100644
--- a/daemon-init-redhat.in
+++ b/daemon-init-redhat.in
@@ -2,9 +2,8 @@
 #
 # Icinga	Startup script for the Icinga monitoring daemon
 #
-# chkconfig:	85 15
+# chkconfig:	- 85 15
 # description:	Icinga is a service monitoring system
-
 ### BEGIN INIT INFO
 # Provides:		icinga
 # Required-Start:	$local_fs $syslog $network
diff --git a/icinga.spec b/icinga.spec
index d4127ec..3bfcfe6 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -17,8 +17,8 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.0.1
-Release: 1%{?dist}
+Version: 1.0.2
+Release: 0rc1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.icinga.org/
@@ -78,6 +78,11 @@ PHP api for %{name}
 %prep
 %setup -n %{name}-%{version}
 
+# If we buld for redhat use the redhat init-script
+%if "%{_vendor}" == "redhat"
+%{__cp} -f daemon-init-redhat.in daemon-init.in
+%endif
+
 # /usr/local/nagios is hardcoded in many places
 %{__perl} -pi.orig -e 's|/usr/local/nagios/var/rw|%{_localstatedir}/nagios/rw|g;' contrib/eventhandlers/submit_check_result
 





More information about the icinga-checkins mailing list