[icinga-checkins] icinga.org: icinga-core/tdressler/fixes: Revert "core: add compatibility include nagios.h and symlink for /usr/ include icinga in icinga.spec"

git at icinga.org git at icinga.org
Sat Oct 27 21:15:47 CEST 2012


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

Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Oct 26 18:06:58 2012 +0200

Revert "core: add compatibility include nagios.h and symlink for /usr/include icinga in icinga.spec"

This reverts commit dcab7b821b7c5a572cbc4a50e16dea6734243952.

refs #3316

---

 Changelog        |    1 -
 icinga.spec      |   10 ----------
 include/nagios.h |    6 ------
 3 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/Changelog b/Changelog
index 1f9ccd4..c81f5a0 100644
--- a/Changelog
+++ b/Changelog
@@ -212,7 +212,6 @@ classic ui: Added/Changed cgi.cfg options
 
 * icinga.spec: add devel package #2634
 * icinga.spec: forced update on icinga.cfg change package locations #2923
-* icinga.spec: add nagios include symlink #3316 - TD
 
 
 
diff --git a/icinga.spec b/icinga.spec
index 5603c51..2189324 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -302,16 +302,6 @@ if [ $1 -eq 0 ]; then
     /sbin/chkconfig --del ido2db
 fi
 
-%post devel
-#add compatibility symlink for nagios
-if [ ! -e %{_includedir}/nagios ] ; then
-	ln -s %{_includedir}/%{name} %{_includedir}/nagios
-fi 
-
-%postun devel
-if [ "$(readlink %{_includedir}/nagios)" = "%{_includedir}/%{name}" ]; then
-	rm %{_includedir}/nagios
-fi
 
 %clean
 %{__rm} -rf %{buildroot}
diff --git a/include/nagios.h b/include/nagios.h
deleted file mode 100644
index 76c8950..0000000
--- a/include/nagios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _NAGIOS_H
-#define _NAGIOS_H
-
-#include <icinga/icinga.h>
-#endif
-





More information about the icinga-checkins mailing list