From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 21 Apr 2015 13:20:36 +0000 (+0200)
Subject: Fix incorrect boost package path for RHEL 6
X-Git-Tag: v2.4.0~704
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1875c8d7a6fa8d70cef831de3614bbfa3190837;p=icinga2

Fix incorrect boost package path for RHEL 6
---

diff --git a/icinga2.spec b/icinga2.spec
index 38defdd83..b29c78228 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -100,7 +100,7 @@ BuildRequires: flex >= 2.5.35
 BuildRequires: bison
 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
 BuildRequires: boost153-devel
 %else
@@ -205,7 +205,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
          -DICINGA2_GROUP=%{icinga_group} \
          -DICINGA2_COMMAND_GROUP=%{icingacmd_group}"
 %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
 # details in https://dev.icinga.org/issues/5033
 CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost153 \