[icinga-checkins] icinga.org: icinga-irpe/aflatto/irpe: added fixed to match new project name

git at icinga.org git at icinga.org
Fri Apr 20 21:54:36 CEST 2012


Module: icinga-irpe
Branch: aflatto/irpe
Commit: fbd590e38cf5784b1c141f8017e1aee8c9f88e7a
URL:    https://git.icinga.org/?p=icinga-irpe.git;a=commit;h=fbd590e38cf5784b1c141f8017e1aee8c9f88e7a

Author: Assaf <assaf at aikilinux-laptop.(none)>
Date:   Fri Apr 20 17:21:10 2012 +0100

added fixed to match new project name

---

 irpe.spec |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/irpe.spec b/irpe.spec
index e19b897..f7d3e91 100644
--- a/irpe.spec
+++ b/irpe.spec
@@ -89,13 +89,13 @@ fi
 
 %preun
 if [ "$1" = 0 ]; then
-	/sbin/service icinga stop > /dev/null 2>&1
-	/sbin/chkconfig --del icinga
+	/sbin/service icinga stop > /dev/null 2>&1  # why do we need to stop icinga for irpe build ?
+	/sbin/chkconfig --del icinga                # why do we need to stop icinga for irpe build ?
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-	/sbin/service icinga condrestart >/dev/null 2>&1 || :
+	/sbin/service icinga condrestart >/dev/null 2>&1 || :   # why do we need to stop icinga for irpe build ?
 fi
 
 %build
@@ -126,10 +126,10 @@ install -d -m 0755 ${RPM_BUILD_ROOT}/usr/sbin
 install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/icinga/plugins
 
 # install templated configuration files
-cp sample-config/icinga.cfg ${RPM_BUILD_ROOT}/etc/icinga/icinga.cfg
-cp init-script ${RPM_BUILD_ROOT}/etc/init.d/icinga
-cp src/icinga ${RPM_BUILD_ROOT}/usr/sbin
-cp src/check_icinga ${RPM_BUILD_ROOT}/usr/lib/icinga/plugins
+cp sample-config/irpe.cfg ${RPM_BUILD_ROOT}/etc/icinga/irpe.cfg
+cp init-script ${RPM_BUILD_ROOT}/etc/init.d/irpe
+cp src/irpe ${RPM_BUILD_ROOT}/usr/sbin
+cp src/check_irpe ${RPM_BUILD_ROOT}/usr/lib/icinga/plugins
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -137,11 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(755,root,root)
-/etc/init.d/icinga
-%{_prefix}/sbin/icinga
+/etc/init.d/irpe
+%{_prefix}/sbin/irpe
 %dir /etc/icinga
 %defattr(644,root,root)
-%config(noreplace) /etc/icinga/*.cfg
+%config(noreplace) /etc/icinga/irpe.cfg
 %defattr(755,%{nsusr},%{nsgrp})
 %doc Changelog LEGAL README 
 
@@ -152,6 +152,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog LEGAL README
 
 %changelog
+* Fri Apr 20 2012 Assaf Flatto <icinga at flatto.net>
+- fix name for executable created
+- fix name of init script when copied to /etc/init.d directory
+- fix name of check_* plugin 
+
+
 * Mon Jan 23 2006 Andreas Kasenides ank<@>cs.ucy.ac.cy
 - fixed icinga.cfg relocation to sample-config
 - replaced Copyright label with License
@@ -170,3 +176,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Dec 28 2002 James 'Showkilr' Peterson <showkilr at showkilr.com>
 - First RPM build (1.5-1)
+





More information about the icinga-checkins mailing list