]> granicus.if.org Git - icinga2/commitdiff
spec: Drop boost detection workaround.
authorMichael Friedrich <michael.friedrich@netways.de>
Tue, 8 Oct 2013 13:25:57 +0000 (15:25 +0200)
committerMichael Friedrich <michael.friedrich@netways.de>
Tue, 8 Oct 2013 13:25:57 +0000 (15:25 +0200)
icinga2.spec.in

index ef40318b885b480b4e44672c58d5128e33477caa..ee9d2e7a32db82943aca42cd0f39d65c99aa28eb 100644 (file)
@@ -124,26 +124,10 @@ IDOUtils schema >= 1.10
 %setup -q -n %{name}-%{version}
 
 %build
-
-# el5 requires special treatment for boost from epel
-# 1) set CPATH, LD_LIBRARY_PATH for path detection
-# 2) set --with-boost[-libdir] for library version checks
-%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
-export CPATH="%{el5_boost_includes}:$CPATH"
-export LD_LIBRARY_PATH="%{el5_boost_libs}:$LD_LIBRARY_PATH"
-%configure --with-icinga-user=$USER \
-       --with-icinga-group=$USER \
-       --with-icingacmd-user=$USER \
-       --with-icingacmd-group=$USER \
-       --with-boost="%{el5_boost_libs}" \
-       --with-boost-libdir="%{el5_boost_libs}"
-%else
-# the famous others
 %configure --with-icinga-user=$USER \
        --with-icinga-group=$USER \
        --with-icingacmd-user=$USER \
        --with-icingacmd-group=$USER
-%endif
 
 make %{?_smp_mflags}