Skip to content
Snippets Groups Projects
Commit 8df16a50 authored by Morris Jette's avatar Morris Jette
Browse files

remove chaos specific macros use from slurm.spec

The "chaos" macros is LLNL specific and .rpmmacros can be used
instead to identify the desired environment
parent bc0ea4d3
No related branches found
No related tags found
No related merge requests found
...@@ -73,20 +73,9 @@ ...@@ -73,20 +73,9 @@
%slurm_with_opt aix %slurm_with_opt aix
%endif %endif
# Build with sgijob plugin and mysql (for slurmdbd) on CHAOS systems
%if %{?chaos}0
%slurm_with_opt mysql
%slurm_with_opt lua
%slurm_with_opt partial_attach
%else
%slurm_without_opt sgijob %slurm_without_opt sgijob
%slurm_without_opt lua %slurm_without_opt lua
%slurm_without_opt partial-attach %slurm_without_opt partial-attach
%endif
%if %{?chaos}0 && 0%{?chaos} < 5
%slurm_with_opt sgijob
%endif
%if %{slurm_with cray_alps} %if %{slurm_with cray_alps}
%slurm_with_opt sgijob %slurm_with_opt sgijob
...@@ -124,12 +113,6 @@ BuildRequires: SUNWgcc ...@@ -124,12 +113,6 @@ BuildRequires: SUNWgcc
BuildRequires: SUNWgnome-common-devel BuildRequires: SUNWgnome-common-devel
%endif %endif
%if %{?chaos}0
BuildRequires: gtk2-devel >= 2.7.1
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
%endif
# not sure if this is always an actual rpm or not so leaving the requirement out # not sure if this is always an actual rpm or not so leaving the requirement out
#%if %{slurm_with blcr} #%if %{slurm_with blcr}
#BuildRequires: blcr #BuildRequires: blcr
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment