From 8e1bd9a40375196972a03530c01be1302693cb2b Mon Sep 17 00:00:00 2001 From: Stephen Nicholas Swatman Date: Thu, 22 Aug 2024 15:14:09 +0200 Subject: root: remove +webgui~http conflict version clause (#45856) * root: set +webgui~http conflict from @6.28.12: Currently, the ROOT spec correctly identifies a conflict between +webgui and ~http, but this conflict is marked as affecting @6.29.00: only. As a matter of fact, ROOT 6.28.12 is also affected. This commit, therefore, updates the when clause on the conflict to @6.28.12:. * Remove when clause entirely * oops --- var/spack/repos/builtin/packages/root/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index aec5af2737..096aa269bb 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -423,7 +423,7 @@ class Root(CMakePackage): conflicts("+tmva-gpu", when="~cuda", msg="root+tmva-gpu requires CUDA") conflicts("+tmva-pymva", when="~tmva", msg="root+tmva-pymva requires TMVA") conflicts("+tmva-sofie", when="~tmva", msg="root+tmva-sofie requires TMVA") - conflicts("~http", when="@6.29.00: +webgui", msg="root+webgui requires HTTP") + conflicts("~http", when="+webgui", msg="root+webgui requires HTTP") conflicts("cxxstd=11", when="+root7", msg="root7 requires at least C++14") conflicts("cxxstd=11", when="@6.25.02:", msg="This version of root requires at least C++14") conflicts("cxxstd=14", when="@6.30.00:", msg="This version of root requires at least C++17") -- cgit v1.2.3-70-g09d2