diff --git a/slurm.changes b/slurm.changes index b436c47..f9e8f16 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 6 18:05:33 UTC 2019 - Egbert Eich + +- Do not build hdf5 support where not available. + ------------------------------------------------------------------- Sat Jul 6 11:21:08 UTC 2019 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index 501283d..4099390 100644 --- a/slurm.spec +++ b/slurm.spec @@ -56,6 +56,11 @@ %define have_netloc 1 %endif +%if 0%{?is_opensuse:1} || 0%{?sle_version} >= 150000 +%define have_hdf5 1 +%define have_boolean_deps 1 +%endif + %ifarch x86_64 %define have_libnuma 1 %else @@ -103,14 +108,20 @@ Patch12: pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch %{?upgrade:Conflicts: %{pname}} Requires: %{name}-config = %{version} +%if 0%{?have_boolean_deps} Requires: (munge if %{name}-munge) +%else +Requires: munge +%endif Requires(pre): %{name}-node = %{version} Recommends: %{name}-doc = %{version} Recommends: %{name}-config-man = %{version} BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gtk2-devel +%if 0%{?have_hdf5} BuildRequires: hdf5-devel +%endif BuildRequires: libbitmask-devel BuildRequires: libcpuset-devel BuildRequires: python @@ -1038,9 +1049,11 @@ exit 0 %{_mandir}/man5/topology.* %{_mandir}/man5/knl.conf.5.* +%if 0%{?have_hdf5} %files hdf5 %{_bindir}/sh5util %{_libdir}/slurm/acct_gather_profile_hdf5.so %{_mandir}/man1/sh5util.1.gz +%endif %changelog