Remove icinga2-list-objects

refs #7251
Icinga · Oct 15, 2014 · 425dbba · 425dbba
1 parent db3abac
commit 425dbba
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 938 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -164,7 +164,6 @@ add_subdirectory(doc)
 add_subdirectory(test)
 add_subdirectory(pki)
 add_subdirectory(agent)
-add_subdirectory(python)
 
 set(CPACK_PACKAGE_NAME "Icinga2")
 set(CPACK_PACKAGE_VENDOR "Icinga Development Team")

diff --git a/INSTALL.md b/INSTALL.md
@@ -25,7 +25,6 @@ parentheses):
 * Boost library and header files (boost-devel on RHEL, libboost-all-dev on Debian)
 * GNU bison (bison)
 * GNU flex (flex) >= 2.5.35
-* Python (python-devel on RHEL, python-dev on Debian)
 * recommended: libexecinfo on FreeBSD
 * optional: MySQL (mysql-devel on RHEL, libmysqlclient-dev on Debian)
 * optional: PostgreSQL (postgresql-devel on RHEL, libpq-dev on Debian)

diff --git a/debian/control b/debian/control
@@ -20,9 +20,7 @@ Build-Depends: bison,
                libpq-dev,
                libssl-dev,
                make (>= 3.81),
-               po-debconf,
-               python-setuptools,
-               python-all
+               po-debconf
 Standards-Version: 3.9.5
 Homepage: http://www.icinga.org
 
@@ -54,7 +52,7 @@ Description: host and network monitoring system
 
 Package: icinga2-common
 Architecture: all
-Depends: python-icinga2 (= ${source:Version}), adduser, lsb-release, ${misc:Depends}
+Depends: adduser, lsb-release, ${misc:Depends}
 Description: host and network monitoring system - common files
  Icinga 2 is a general-purpose monitoring application and the next generation
  after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
@@ -241,27 +239,3 @@ Description: host and network monitoring system - debug symbols
  .
  This package provides debug symbols for Icinga 2.
 
-Package: python-icinga2
-Architecture: all
-Section: python
-Priority: extra
-Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
-Description: host and network monitoring system - Python module
- Icinga 2 is a general-purpose monitoring application and the next generation
- after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
- environment as well as big installations.
- .
- Rewritten from scratch in C++, with multi-threading and cluster support.
- .
- Features:
-  * All common features of Icinga and Nagios
-  * Much faster and more scalable than Icinga 1 and Nagios
-  * New configuration format, more intuitive and template based
-  * Monitoring several services by executing checks (see nagios-plugins*)
-    for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port
-  * Any small script can be used as a check plugin, when following the Nagios
-    plugin API
-  * Notifications about alerts with any custom script, or shipped examples
-  * Native support for Livestatus and Graphite
- .
- This package provides the Python module for Icinga 2.
diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
@@ -5,7 +5,6 @@ debian/tmp/etc/bash_completion.d
 tools/syntax/* 		      usr/share/icinga2-common/syntax
 usr/bin/icinga2-build*
 usr/bin/icinga2-sign-key
-usr/sbin/icinga2-list-objects
 usr/sbin/icinga2-*-agent
 usr/sbin/icinga2-list-agents
 usr/share/icinga2
diff --git a/debian/python-icinga2.install b/debian/python-icinga2.install
diff --git a/debian/rules b/debian/rules
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2
+	dh $@
 
 override_dh_auto_clean:
 ifeq ($(shell test -d .git && echo "git"),git) # verify we are in a GIT repo

diff --git a/icinga2.spec b/icinga2.spec
@@ -49,10 +49,6 @@
 %endif
 %endif
 
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
 %define icinga_user icinga
 %define icinga_group icinga
 %define icingacmd_group icingacmd
@@ -81,7 +77,6 @@ Meta package for Icinga 2 Core, DB IDO and Web.
 Summary:      Icinga 2 binaries and libraries
 Group:        Applications/System
 
-Requires: python-%{name} = %{version}-%{release}
 %if "%{_vendor}" == "suse"
 PreReq:        permissions
 Provides:      monitoring_daemon
@@ -180,17 +175,6 @@ Icinga 1.x Classic UI Standalone configuration with locations
 for Icinga 2.
 
 
-%package -n python-icinga2
-Summary:      Python module for Icinga 2
-Group:        Application/System
-BuildRequires: python
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-Requires:     python-setuptools
-
-%description -n python-icinga2
-Provides a Python module for Icinga 2.
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -534,9 +518,4 @@ exit 0
 %config(noreplace) %{apacheconfdir}/icinga.conf
 %config(noreplace) %attr(0640,root,%{apachegroup}) %{icingaclassicconfdir}/passwd
 
-%files -n python-icinga2
-%defattr(-,root,root,-)
-%{python2_sitelib}/icinga2*
-
-
 %changelog
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
diff --git a/python/icinga2/CMakeLists.txt b/python/icinga2/CMakeLists.txt
diff --git a/python/icinga2/__init__.py b/python/icinga2/__init__.py
diff --git a/python/icinga2/commands/CMakeLists.txt b/python/icinga2/commands/CMakeLists.txt
diff --git a/python/icinga2/commands/__init__.py b/python/icinga2/commands/__init__.py
diff --git a/python/icinga2/commands/list_objects.py b/python/icinga2/commands/list_objects.py
diff --git a/python/icinga2/config.py.cmake b/python/icinga2/config.py.cmake
diff --git a/python/icinga2/utils/CMakeLists.txt b/python/icinga2/utils/CMakeLists.txt
diff --git a/python/icinga2/utils/__init__.py b/python/icinga2/utils/__init__.py