Skip to content
Snippets Groups Projects
Commit 8f4d0293 authored by Alexander A. Klimov's avatar Alexander A. Klimov :sunglasses:
Browse files

icinga2.spec: remove dropped CentOS 6

parent a82791fe
No related branches found
No related tags found
1 merge request!39Use GCC 11 on CentOS 7
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%define apacheuser apache %define apacheuser apache
%define apachegroup apache %define apachegroup apache
%if 0%{?el6}%{?amzn} %if 0%{?amzn}
%define use_systemd 0 %define use_systemd 0
%define use_selinux 0 %define use_selinux 0
%if %(uname -m) != "x86_64" %if %(uname -m) != "x86_64"
...@@ -123,17 +123,8 @@ BuildRequires: gcc48-c++ ...@@ -123,17 +123,8 @@ BuildRequires: gcc48-c++
BuildRequires: libopenssl1-devel BuildRequires: libopenssl1-devel
BuildRequires: libstdc++48-devel BuildRequires: libstdc++48-devel
%else %else
%if "%{_vendor}" == "redhat" && (0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# Requires devtoolset-7 scl
%define scl_name devtoolset-7
%define scl_enable scl enable %{scl_name} --
BuildRequires: %{scl_name}-binutils
BuildRequires: %{scl_name}-gcc-c++
BuildRequires: %{scl_name}-libstdc++-devel
%else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libstdc++-devel BuildRequires: libstdc++-devel
%endif
BuildRequires: openssl-devel BuildRequires: openssl-devel
%endif %endif
BuildRequires: bison BuildRequires: bison
...@@ -170,13 +161,6 @@ BuildRequires: libboost_test-devel%{?boost_devel_suffix} >= %{boost_min_version ...@@ -170,13 +161,6 @@ BuildRequires: libboost_test-devel%{?boost_devel_suffix} >= %{boost_min_version
# default boost devel package # default boost devel package
%define boost_devel_pkg boost-devel %define boost_devel_pkg boost-devel
%if (0%{?el6} || 0%{?rhel} == 6)
# Provided by packages.icinga.com
%define boost_library icinga-boost169
%define boost_version 1.69
%define boost_devel_pkg icinga-boost169-devel
%define boost_rpath %{_libdir}/%{boost_library}
%endif # el6
%if (0%{?el7} || 0%{?rhel} == 7) %if (0%{?el7} || 0%{?rhel} == 7)
# Provided by EPEL # Provided by EPEL
%define boost_library boost169 %define boost_library boost169
...@@ -413,11 +397,6 @@ CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=ON" ...@@ -413,11 +397,6 @@ CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=ON"
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=OFF" CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=OFF"
%endif %endif
%if (0%{?el6} || 0%{?rhel} == 6)
# Explicitly link against rt, because ld doesn't detect it automatically
CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_EXE_LINKER_FLAGS=-lrt"
%endif # el6
%if "%{?boost_rpath}" != "" %if "%{?boost_rpath}" != ""
CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_INSTALL_RPATH=%{boost_rpath}" CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_INSTALL_RPATH=%{boost_rpath}"
%endif # boost_rpath %endif # boost_rpath
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment