[icinga-checkins] icinga.org: icinga-core/test/core: icinga.spec: use eventhandler configure/ make in package creation from #2352 #2363

git at icinga.org git at icinga.org
Sat Feb 25 21:13:57 CET 2012


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Feb 25 19:24:34 2012 +0100

icinga.spec: use eventhandler configure/make in package creation from #2352 #2363

refs #2363

---

 Changelog   |    1 +
 icinga.spec |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index 02d36df..aad7b52 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,7 @@ ENHANCEMENTS
 * icinga.spec: add "README LICENSE Changelog UPGRADING" to all packages as docs (thx Michael Gruener) #2212
 * icinga.spec: put module/idoutils/db into docs instead of manually copying to /etc/icinga/idoutils (thx Michael Gruener) #2357
 * icinga.spec: add README.RHEL README.RHEL.idoutils to upstream, being installed as docs (thx Michael Gruener, Stefan Marx) #2212
+* icinga.spec: use eventhandler configure/make in package creation from #2352 #2363
 
 FIXES
 * core: Plug some macro leaks triggered when sending notifications (Andreas Ericsson) #2109
diff --git a/icinga.spec b/icinga.spec
index 53ec770..140ab2c 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -110,6 +110,7 @@ Documentation for %{name}
     --with-log-dir=%{logdir} \
     --with-cgi-log-dir=%{logdir}/gui \
     --with-plugin-dir="%{_libdir}/nagios/plugins" \
+    --with-eventhandler-dir="%{_libdir}/icinga/eventhandlers" \
     --with-p1-file-dir="%{_libdir}/icinga"
 %{__make} %{?_smp_mflags} all
 
@@ -122,6 +123,7 @@ Documentation for %{name}
     install-config \
     install-webconf \
     install-idoutils \
+    install-eventhandlers \
     DESTDIR="%{buildroot}" \
     INSTALL_OPTS="" \
     INSTALL_OPTS_WEB="" \
@@ -201,6 +203,7 @@ fi
 %attr(755,-,-) %{_bindir}/icinga
 %attr(755,-,-) %{_bindir}/icingastats
 %attr(755,-,-) %{_libdir}/icinga/p1.pl
+%{_libdir}/icinga/eventhandlers
 %defattr(-,icinga,icinga,-)
 %{logdir}
 %{logdir}/archives
@@ -266,6 +269,8 @@ fi
 %changelog
 * Sat Feb 25 2012 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.6.1-5
 - add README.RHEL README.RHEL.idoutils to docs, thx Michael Gruener, Stefan Marx #2212
+- use newly introduced --with-eventhandler-dir and make install-eventhandlers
+- install sample eventhandlers to {_libdir}/icinga/eventhandlers
 
 * Fri Feb 24 2012 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.6.1-4
 - rename idomod.o to idomod.so - see #2354





More information about the icinga-checkins mailing list