Update API actions

[icinga2] / icinga2.spec

diff --git a/icinga2.spec b/icinga2.spec
index ac2f82d70b9f702cdd319813b7979bd76ca90f3f..394ee1e2b1e5b2e32d77757f302441d31ed3bdcc 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.3.4
+Version: 2.3.11
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
@@ -92,9 +92,15 @@ BuildRequires: libyajl-devel
 %endif
 BuildRequires: libedit-devel
 BuildRequires: ncurses-devel
-BuildRequires: openssl-devel
+%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
+BuildRequires: gcc47-c++
+BuildRequires: libstdc++47-devel
+BuildRequires: libopenssl1-devel
+%else
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
+BuildRequires: openssl-devel
+%endif
 BuildRequires: cmake
 BuildRequires: flex >= 2.5.35
 BuildRequires: bison
@@ -153,8 +159,14 @@ Summary:      IDO MySQL database backend for Icinga 2
 Group:        Applications/System
 %if "%{_vendor}" == "suse"
 BuildRequires: libmysqlclient-devel
+%if 0%{?suse_version} >= 1310
+BuildRequires: mysql-devel
 %endif
+
+%else
 BuildRequires: mysql-devel
+%endif #suse
+
 Requires: %{name} = %{version}-%{release}
 
 %description ido-mysql
@@ -189,7 +201,7 @@ Conflicts:    icinga-gui-config
 Icinga 1.x Classic UI Standalone configuration with locations
 for Icinga 2.
 
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 %global selinux_variants mls targeted
 %{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)}
 %global modulename %{name}
@@ -262,7 +274,7 @@ cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CX
 
 make %{?_smp_mflags}
 
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 cd tools/selinux
 for selinuxvariant in %{selinux_variants}
 do
@@ -296,7 +308,7 @@ mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/"
 mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
 %endif
 
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 cd tools/selinux
 for selinuxvariant in %{selinux_variants}
 do
@@ -322,17 +334,25 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s
   %service_add_pre %{name}.service
 %endif
 %endif
-exit 0
 
 %if "%{_vendor}" == "suse"
 %verifyscript bin
 %verify_permissions -e %{_rundir}/%{name}/cmd
+%endif
 
-%if 0%{?suse_version} >= 1310
 %post bin
+
+# install the api setup
+%{_sbindir}/%{name} api setup
+
+# suse
+%if "%{_vendor}" == "suse"
+
+%if 0%{?suse_version} >= 1310
 %set_permissions %{_rundir}/%{name}/cmd
 %endif
-%endif
+
+%endif #suse/rhel
 
 %post common
 # suse
@@ -488,7 +508,7 @@ fi
 
 exit 0
 
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 %post selinux
 for selinuxvariant in %{selinux_variants}
 do
@@ -610,10 +630,10 @@ fi
 %config(noreplace) %{apacheconfdir}/icinga.conf
 %config(noreplace) %attr(0640,root,%{apachegroup}) %{icingaclassicconfdir}/passwd
 
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 %files selinux
 %defattr(-,root,root,0755)
-%doc SELinux/*
+%doc tools/selinux/*
 %{_datadir}/selinux/*/%{modulename}.pp
 %endif