tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect boost package path for RHEL 6

Browse Source
This commit is contained in:
Gunnar Beutner 2015-04-21 15:20:36 +02:00
parent 84a02c1d7f
commit c1875c8d7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icinga2.spec
View File

@ -100,7 +100,7 @@ BuildRequires: flex >= 2.5.35
BuildRequires: bison BuildRequires: bison
BuildRequires: make BuildRequires: make
%if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && ((0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5") || (0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")) %if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# el5 and el6 require packages.icinga.org # el5 and el6 require packages.icinga.org
BuildRequires: boost153-devel BuildRequires: boost153-devel
%else %else
@ -205,7 +205,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
-DICINGA2_GROUP=%{icinga_group} \ -DICINGA2_GROUP=%{icinga_group} \
-DICINGA2_COMMAND_GROUP=%{icingacmd_group}" -DICINGA2_COMMAND_GROUP=%{icingacmd_group}"
%if "%{_vendor}" == "redhat" %if "%{_vendor}" == "redhat"
%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" %if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6"
# Boost_VERSION 1.41.0 vs 101400 - disable build tests # Boost_VERSION 1.41.0 vs 101400 - disable build tests
# details in https://dev.icinga.org/issues/5033 # details in https://dev.icinga.org/issues/5033
CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost153 \ CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost153 \