[icinga-checkins] icinga.org: icinga2/feature/sles-build-5027: Fix SLES boost detection.

git at icinga.org git at icinga.org
Fri Nov 8 11:33:29 CET 2013


Module: icinga2
Branch: feature/sles-build-5027
Commit: c89ee47e1db9da8b23c8b5c828092a803e5c5ae0
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=c89ee47e1db9da8b23c8b5c828092a803e5c5ae0

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Fri Nov  8 09:53:32 2013 +0100

Fix SLES boost detection.

Refs #5027

---

 icinga2.spec |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/icinga2.spec b/icinga2.spec
index a061c0c..f7f546c 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -64,6 +64,7 @@ BuildRequires: flex
 BuildRequires: bison
 BuildRequires: %{apachename}
 
+# redhat
 %if "%{_vendor}" == "redhat"
 %if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
 # el5 requires EPEL
@@ -83,10 +84,16 @@ Requires: boost-thread >= 1.41
 Requires: boost-regex >= 1.41
 %endif
 %endif
+#redhat
 
+# suse
 %if "%{_vendor}" == "suse"
-%if 0%{?sles_version} >= 1110
-BuildRequires: libgfortran46
+# sles
+# note: sles_version macro is not set in SLES11 anymore
+# note: sles service packs are not under version control
+%if 0%{?suse_version} == 1110
+BuildRequires: gcc-fortran
+BuildRequires: libgfortran
 BuildRequires: boost-license%{sles_boost_version}
 BuildRequires: boost-devel >= 1.41
 Requires: boost-license%{sles_boost_version}
@@ -94,7 +101,9 @@ Requires: libboost_program_options%{sles_boost_version}
 Requires: libboost_system%{sles_boost_version}
 Requires: libboost_test%{sles_boost_version}
 Requires: libboost_thread%{sles_boost_version}
-%else
+Requires: libboost_regex%{sles_boost_version}
+%endif
+# opensuse
 %if 0%{?suse_version} >= 1210
 BuildRequires: boost-devel >= 1.41
 Requires: libboost_program_options%{opensuse_boost_version}
@@ -104,7 +113,7 @@ Requires: libboost_thread%{opensuse_boost_version}
 Requires: libboost_regex%{opensuse_boost_version}
 %endif
 %endif
-%endif
+# suse
 
 Requires: %{name}-common = %{version}
 





More information about the icinga-checkins mailing list