Update "swap" check command.

[icinga2] / icinga2.spec

diff --git a/icinga2.spec b/icinga2.spec
index 07dac804fb77ae6955da13281544a0cb695afb63..12437e44ac64e68825938f77219dcef7f86abeb5 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -1,6 +1,6 @@
 #/******************************************************************************
 # * Icinga 2                                                                   *
-# * Copyright (C) 2012-present Icinga Development Team (http://www.icinga.org) *
+# * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
 # *                                                                            *
 # * This program is free software; you can redistribute it and/or              *
 # * modify it under the terms of the GNU General Public License                *
@@ -29,7 +29,12 @@
 %define apachegroup apache
 %endif
 %if "%{_vendor}" == "suse"
+# opensuse 13
+%if 0%{?suse_version} >= 1310
+%define opensuse_boost_version 1_53_0
+%else
 %define opensuse_boost_version 1_49_0
+%endif
 %define sles_boost_version 1_54_0
 %define apachename apache2
 %define apacheconfdir  %{_sysconfdir}/apache2/conf.d
@@ -40,6 +45,8 @@
 %define icinga_user icinga
 %define icinga_group icinga
 %define icingacmd_group icingacmd
+%define icingaweb2name icingaweb2
+%define icingaweb2version 2.0.0
 
 %define icingaclassicconfdir %{_sysconfdir}/icinga
 
@@ -47,7 +54,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 0.0.6
+Version: 0.0.9
 Release: %{revision}%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -55,14 +62,26 @@ Source: %{name}-%{version}.tar.gz
 URL: http://www.icinga.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+Requires: %{name}-bin = %{version}
+#Requires: %{name}-ido-mysql = %{version}
+#Requires: %{icingaweb2name} >= %{icingaweb2version}
+
+%description
+Meta package for Icinga 2 Core, DB IDO and Web.
+
+%package bin
+Summary:      Icinga 2 binaries and libraries
+Group:        Applications/System
+
 BuildRequires: doxygen
+BuildRequires: pandoc
+BuildRequires: python-sphinx
 BuildRequires: openssl-devel
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
 BuildRequires: cmake
 BuildRequires: flex >= 2.5.35
 BuildRequires: bison
-BuildRequires: %{apachename}
 
 # redhat
 %if "%{_vendor}" == "redhat"
@@ -117,8 +136,9 @@ Requires: libboost_regex%{opensuse_boost_version}
 
 Requires: %{name}-common = %{version}
 
-%description
-Icinga is a general-purpose network monitoring application.
+%description bin
+Icinga 2 is a general-purpose network monitoring application.
+Provides binaries and libraries for Icinga 2 Core.
 
 %package common
 Summary:      Common Icinga 2 configuration
@@ -195,6 +215,7 @@ IDOUtils schema >= 1.10
 %package classicui-config
 Summary:      Icinga 2 Classic UI Standalone configuration
 Group:        Applications/System
+BuildRequires: %{apachename}
 Requires:     %{apachename}
 Requires:     %{name} = %{version}-%{release}
 Provides:     icinga-classicui-config
@@ -246,7 +267,7 @@ install -D -m 0644 etc/icinga/icinga-classic-apache.conf %{buildroot}%{apachecon
 
 # fix plugin path on x64
 %if "%{_vendor}" != "suse"
-sed -i 's@plugindir = .*@plugindir = "%{_libdir}/nagios/plugins"@' %{buildroot}/%{_sysconfdir}/%{name}/conf.d/macros.conf
+sed -i 's@PluginDir = .*@PluginDir = "%{_libdir}/nagios/plugins"@' %{buildroot}/%{_sysconfdir}/%{name}/constants.conf
 %endif
 
 # remove features-enabled symlinks
@@ -381,6 +402,8 @@ fi
 exit 0
 
 %files
+
+%files bin
 %defattr(-,root,root,-)
 %doc COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog
 %attr(755,-,-) %{_sysconfdir}/init.d/%{name}
@@ -390,6 +413,7 @@ exit 0
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/constants.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf
 %config(noreplace) %{_sysconfdir}/%{name}/scripts/*
@@ -418,6 +442,7 @@ exit 0
 %files common
 %defattr(-,root,root,-)
 %doc COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog
+%attr(755,-,-) %{_sysconfdir}/logrotate.d/%{name}
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp