The package rpms/root.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/root.git/commit/?id=3487b3a0607005a2....
Change: -%ifarch aarch64
Thanks.
Full change: ============
commit 3487b3a0607005a2c68a7ba59a4ecc790ea51dbd Author: Mattias Ellert mattias.ellert@physics.uu.se Date: Fri Jan 31 13:22:57 2025 +0100
Apply patches to fix build with gcc 15 Enable roofit-multiprocess for EPEL 10 (dependencies available) Rebuild for pythia8 8.3.13
diff --git a/root-Add-a-missing-include-to-RTensor.patch b/root-Add-a-missing-include-to-RTensor.patch new file mode 100644 index 0000000..e5fbd5b --- /dev/null +++ b/root-Add-a-missing-include-to-RTensor.patch @@ -0,0 +1,26 @@ +From cfc922131c8a977e14c6611ed991f0889b0c47c8 Mon Sep 17 00:00:00 2001 +From: Stephan Hageboeck stephan.hageboeck@cern.ch +Date: Fri, 17 Jan 2025 10:35:37 +0100 +Subject: [PATCH 2/2] Add a missing include to RTensor. + +In gcc-15, <cstdint> needs to be included to use fixed-size integer +types. +--- + tmva/tmva/inc/TMVA/RTensor.hxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tmva/tmva/inc/TMVA/RTensor.hxx b/tmva/tmva/inc/TMVA/RTensor.hxx +index ad152f219a..795cc70689 100644 +--- a/tmva/tmva/inc/TMVA/RTensor.hxx ++++ b/tmva/tmva/inc/TMVA/RTensor.hxx +@@ -3,6 +3,7 @@ + + #include <vector> + #include <cstddef> // std::size_t ++#include <cstdint> + #include <stdexcept> // std::runtime_error + #include <sstream> // std::stringstream + #include <memory> // std::shared_ptr +-- +2.48.0 + diff --git a/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch b/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch new file mode 100644 index 0000000..4acfae1 --- /dev/null +++ b/root-Add-a-missing-include-to-RVirtualCanvasPainter.patch @@ -0,0 +1,26 @@ +From 2884f67f5a145ef5d2ba1f8050b2b1a543d97881 Mon Sep 17 00:00:00 2001 +From: Stephan Hageboeck stephan.hageboeck@cern.ch +Date: Fri, 17 Jan 2025 10:32:04 +0100 +Subject: [PATCH 1/2] Add a missing include to RVirtualCanvasPainter. + +In gcc-15, <cstdint> needs to be included when fixed-size integer types +are used. +--- + graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx b/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx +index be2a467280..f5f255ec48 100644 +--- a/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx ++++ b/graf2d/gpadv7/inc/ROOT/RVirtualCanvasPainter.hxx +@@ -9,6 +9,7 @@ + #ifndef ROOT7_RVirtualCanvasPainter + #define ROOT7_RVirtualCanvasPainter + ++#include <cstdint> + #include <memory> + #include <functional> + #include <string> +-- +2.48.0 + diff --git a/root-Fix-out-of-bounds-error-in-pyroot.patch b/root-Fix-out-of-bounds-error-in-pyroot.patch new file mode 100644 index 0000000..4a1611e --- /dev/null +++ b/root-Fix-out-of-bounds-error-in-pyroot.patch @@ -0,0 +1,52 @@ +From 4bece824e886f84b7b05e08baea3762d02f892d6 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert mattias.ellert@physics.uu.se +Date: Wed, 29 Jan 2025 00:31:31 +0100 +Subject: [PATCH] Fix out-of-bounds error in pyroot + + 526/1416 Test #63: pyunittests-bindings-pyroot-pythonizations-pyroot-pyz-tf-pycallables ..........................***Failed 75.51 sec +test_callable (tf_pycallables.TF1.test_callable) +Test function provided as callable ... /usr/include/c++/15/bits/stl_bvector.h:1134: std::vector<bool, _Alloc>::reference std::vector<bool, _Alloc>::operator[](size_type) [with _Alloc = std::allocator<bool>; reference = std::vector<bool>::reference; size_type = long unsigned int]: Assertion '__n < this->size()' failed. + *** Break *** abort + +=========================================================== +The lines below might hint at the cause of the crash. If you see question +marks as part of the stack trace, try to recompile with debugging information +enabled and export CLING_DEBUG=1 environment variable before running. +You may get help by asking at the ROOT forum https://root.cern/forum +preferably using the command (.forum bug) in the ROOT prompt. +Only if you are really convinced it is a bug in ROOT then please submit a +report at https://root.cern/bugs or (preferably) using the command (.gh bug) in +the ROOT prompt. Please post the ENTIRE stack trace +from above as an attachment in addition to anything else +that might help us fixing this issue. +=========================================================== + #10 0x00007f6bcac7fea4 in __pthread_kill_implementation () from /lib64/libc.so.6 + #11 0x00007f6bcac264de in raise () from /lib64/libc.so.6 + #12 0x00007f6bcac0e350 in abort () from /lib64/libc.so.6 + #13 0x00007f6bc9a0be02 in std::__glibcxx_assert_fail(char const*, int, char const*, char const*) () from /lib64/libstdc++.so.6 + #14 0x00007f6bb9b15257 in std::vector<bool, std::allocator<bool> >::operator[](unsigned long) [clone .part.0] [clone .lto_priv.0] (__n=<optimized out>, this=<optimized out>) at /usr/include/c++/15/bits/stl_bvector.h:1134 + #15 0x00007f6bb9bab976 in std::vector<bool, std::allocator<bool> >::operator[] (this=<synthetic pointer>, __n=0) at /usr/include/c++/15/bits/stl_bvector.h:201 + #16 CPyCppyy::Utility::ConstructCallbackPreamble (retType="Double_t", argtypes=..., code=Python Exception <class 'IndexError'>: list index out of range + #17 0x00007f6bb9b389e0 in PyFunction_AsCPointer (pyobject=<optimized out>, pyobject +entry=0x7f6bb8f838c0, rettype="Double_t", signature="(Double_t*,Double_t*)") at /builddir/build/BUILD/root-6.34.02-build/root-6.34.02/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx:2713 + #18 0x00007f6bb9b39851 in CPyCppyy::(anonymous namespace)::FunctionPointerConverter::SetArg (this=0x55eb25d61d40, pyobject=0x7f6bb8f838c0, para=..., ctxt=0x7ffc484855c0) at /builddir/build/BUILD/root-6.34.02-build/root-6.34.02/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx:2768 +--- + bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx +index 7cfb76032a..2741caeb32 100644 +--- a/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx ++++ b/bindings/pyroot/cppyy/CPyCppyy/src/Utility.cxx +@@ -645,7 +645,7 @@ void CPyCppyy::Utility::ConstructCallbackPreamble(const std::string& retType, + << retType << ""), CPyCppyy::DestroyConverter};\n"; + std::vector<bool> arg_is_ptr; + if (nArgs) { +- arg_is_ptr.reserve(nArgs); ++ arg_is_ptr.resize(nArgs); + code << " CPYCPPYY_STATIC std::vector<std::unique_ptr<CPyCppyy::Converter, std::function<void(CPyCppyy::Converter*)>>> argcvs;\n" + << " if (argcvs.empty()) {\n" + << " argcvs.reserve(" << nArgs << ");\n"; +-- +2.48.1 + diff --git a/root-Remove-redundant-and-conflicting-function-declaratio.patch b/root-Remove-redundant-and-conflicting-function-declaratio.patch new file mode 100644 index 0000000..54a9e32 --- /dev/null +++ b/root-Remove-redundant-and-conflicting-function-declaratio.patch @@ -0,0 +1,44 @@ +From d28f5ac3a6947e13b30325bc2b373cff2fcda276 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert mattias.ellert@physics.uu.se +Date: Sun, 19 Jan 2025 13:57:25 +0100 +Subject: [PATCH] Remove redundant (and conflicting) function declarations + +The function fchtak() is implemented earlier in the same file. There +is therefore no need to declare the function later in the same file. +The later declarations redefines the function with an empty parameter +list, which conflicts with the original definition. + +The function stat() is defined by including <sys/stat.h>. The +following daclaration redefines the function with an empty parameter +list, which conflicts with the original definition. +--- + misc/minicern/src/cernlib.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/misc/minicern/src/cernlib.c b/misc/minicern/src/cernlib.c +index b882db2d90..98f7282ce6 100644 +--- a/misc/minicern/src/cernlib.c ++++ b/misc/minicern/src/cernlib.c +@@ -172,8 +172,8 @@ int cfstati_(char *fname, int *info, int *lgname) + #endif + { + struct stat buf; +- char *ptname, *fchtak(); +- int istat=-1, stat(); ++ char *ptname; ++ int istat = -1; + ptname = fchtak(fname,*lgname); + if (ptname == ((void *)0)) return -1; + istat = stat(ptname, &buf); +@@ -226,7 +226,7 @@ void cfopei_(int *lundes, int *medium, int *nwrec, int *mode, int *nbuf, + char *ftext, int *astat, int *lgtx) + #endif + { +- char *pttext, *fchtak(); ++ char *pttext; + int flags = 0; + int fildes; + int perm; +-- +2.48.1 + diff --git a/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch b/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch new file mode 100644 index 0000000..2c2147a --- /dev/null +++ b/root-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch @@ -0,0 +1,30 @@ +From 456d5421706525974d4804e0e1a7880afd7df4fb Mon Sep 17 00:00:00 2001 +From: Bertrand Bellenot bellenot@users.noreply.github.com +Date: Wed, 11 Dec 2024 14:49:52 +0100 +Subject: [PATCH] [gpad] Fix Debug Assertion Failure in libGpad + +Fix the following error in Debug mode with Runtime Check on Windows: +Debug Assertion Failed! +Epression: vector<bool> subscript out of range +--- + graf2d/gpad/src/TPad.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx +index 9c907335f3..dd5abeba91 100644 +--- a/graf2d/gpad/src/TPad.cxx ++++ b/graf2d/gpad/src/TPad.cxx +@@ -3435,8 +3435,8 @@ void TPad::FillCollideGridTH1(TObject *o) + else y2l = fUymin; + } + y2 = (Int_t)((y2l-fY1)/ys); +- for (j=y1; j<=y2; j++) { +- NotFree(x1, j); ++ for (j=y1; j<y2; j++) { ++ NotFree(x1, j); + } + } + x1l = h->GetBinLowEdge(i); +-- +2.48.1 + diff --git a/root-llvm-project-Backport-fix-for-compilation-issue-with.patch b/root-llvm-project-Backport-fix-for-compilation-issue-with.patch new file mode 100644 index 0000000..c51d4d3 --- /dev/null +++ b/root-llvm-project-Backport-fix-for-compilation-issue-with.patch @@ -0,0 +1,41 @@ +From 60da0f7f5971c86407898408abf540c5a43d2d10 Mon Sep 17 00:00:00 2001 +From: Devajith Valaparambil Sreeramaswamy + devajith.valaparambil.sreeramaswamy@cern.ch +Date: Fri, 24 Jan 2025 09:36:13 +0100 +Subject: [PATCH] [llvm-project] Backport fix for compilation issue with gcc-15 + +Update the LLVM tag with the following commits: +2468812ca0d9 UPSTREAM: Add missing include to X86MCTargetDesc.h (#123320) +ed4f96704966 UPSTREAM: [ADT] Add `<cstdint>` to SmallVector (#101761) +--- + interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + .../llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792d..17444147b1 100644 +--- a/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h ++++ b/interpreter/llvm-project/llvm/include/llvm/ADT/SmallVector.h +@@ -19,6 +19,7 @@ + #include <algorithm> + #include <cassert> + #include <cstddef> ++#include <cstdint> + #include <cstdlib> + #include <cstring> + #include <functional> +diff --git a/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +index 437a7bd6ff..fd7d794849 100644 +--- a/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h ++++ b/interpreter/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +@@ -13,6 +13,7 @@ + #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + ++#include <cstdint> + #include <memory> + #include <string> + +-- +2.48.1 + diff --git a/root.spec b/root.spec index 5e7d337..8e8b13f 100644 --- a/root.spec +++ b/root.spec @@ -27,7 +27,7 @@ %global rrr 1 %endif
-%if %{?fedora}%{!?fedora:0} >= 40 +%if %{?fedora}%{!?fedora:0} >= 40 || %{?rhel}%{!?rhel:0} >= 10 %global roofitmp 1 %else %global roofitmp 0 @@ -39,7 +39,7 @@ Name: root Version: 6.34.02 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 4%{?dist} +Release: 5%{?dist} Summary: Numerical data analysis framework
License: LGPL-2.1-or-later @@ -89,6 +89,22 @@ Patch7: %{name}-tmva-sofie-Fix-Tile-operator.patch # Adjust test/stressGraphics.ref # https://github.com/root-project/root/pull/17398 Patch8: %{name}-Adjust-test-stressGraphics.ref.patch +# Fix out of bounds error reported with gcc 15 +# https://github.com/root-project/root/pull/17249 +Patch9: %{name}-gpad-Fix-Debug-Assertion-Failure-in-libGpad.patch +# Missing includes for compiling with gcc 15 +# https://github.com/root-project/root/pull/17443 +Patch10: %{name}-Add-a-missing-include-to-RVirtualCanvasPainter.patch +Patch11: %{name}-Add-a-missing-include-to-RTensor.patch +# Conflicting declarations (gcc 15) +# https://github.com/root-project/root/pull/17455 +Patch12: %{name}-Remove-redundant-and-conflicting-function-declaratio.patch +# Missing includes for compiling with gcc 15 +# https://github.com/root-project/root/pull/17510 +Patch13: %{name}-llvm-project-Backport-fix-for-compilation-issue-with.patch +# Fix out of bounds errors reported with gcc 15 +# https://github.com/root-project/root/pull/17551 +Patch14: %{name}-Fix-out-of-bounds-error-in-pyroot.patch
BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -1975,6 +1991,12 @@ This package contains utility functions for ntuples. %patch -P6 -p1 %patch -P7 -p1 %patch -P8 -p1 +%patch -P9 -p1 +%patch -P10 -p1 +%patch -P11 -p1 +%patch -P12 -p1 +%patch -P13 -p1 +%patch -P14 -p1
# Remove bundled sources in order to be sure they are not used # * afterimage @@ -2558,12 +2580,12 @@ test-webgui-ping" # 0u # Which is: 0 # -# test-stressgraphics-firefox-skip3d: -# requires firefox... -# # gtest-tree-treeplayer-treetreeplayertestUnit: # segmentation fault # +# test-stressgraphics-firefox-skip3d: +# requires firefox... +# # tutorial-webcanv-fonts_ttf.cxx: # Requires web graphics # @@ -2574,8 +2596,8 @@ test-webgui-ping" # import xgboost as xgb excluded="${excluded}|\ gtest-roofit-roofit-vectorisedPDFs-testLandau|\ -test-stressgraphics-firefox-skip3d|\ gtest-tree-treeplayer-treetreeplayertestUnit|\ +test-stressgraphics-firefox-skip3d|\ tutorial-webcanv-fonts_ttf.cxx|\ tutorial-roofit-rf617_simulation_based_inference_multidimensional-py|\ tutorial-roofit-rf618_mixture_models-py" @@ -2607,20 +2629,18 @@ excluded="${excluded}|\ gtest-tree-dataframe-dataframe-concurrency" %endif
-%ifarch aarch64 -# - tutorial-tmva-RBatchGenerator_filters_vectors-py -# Randomly segfaults -# *** Break *** segmentation violation -excluded="${excluded}|\ -tutorial-tmva-RBatchGenerator_filters_vectors-py" -%endif - %ifarch %{power64} # - tutorial-roostats-IntervalExamples-py # *** Break *** segmentation violation excluded="${excluded}|\ -gtest-tree-ntuple-v7-ntuple-evolution|\ tutorial-roostats-IntervalExamples-py" + +%if %{?fedora}%{!?fedora:0} >= 42 +# - gtest-tree-ntuple-v7-ntuple-evolution +# waitpid() failed +excluded="${excluded}|\ +gtest-tree-ntuple-v7-ntuple-evolution" +%endif %endif
%ifarch s390x @@ -2649,8 +2669,8 @@ gtest-roofit-roofitcore-testLikelihoodGradientJob" # - gtest-tree-ntuple-v7-ntuple-multi-column # - gtest-tree-ntuple-v7-ntuple-packing # - gtest-tree-ntuple-v7-ntuple-parallel-writer -# - gtest-tree-ntuple-v7-ntuple-project # - gtest-tree-ntuple-v7-ntuple-processor +# - gtest-tree-ntuple-v7-ntuple-project # - gtest-tree-ntuple-v7-ntuple-show # - gtest-tree-ntuple-v7-ntuple-storage # - gtest-tree-ntuple-v7-ntuple-storage-daos @@ -2700,8 +2720,8 @@ gtest-tree-ntuple-v7-ntuple-modelext|\ gtest-tree-ntuple-v7-ntuple-multi-column|\ gtest-tree-ntuple-v7-ntuple-packing|\ gtest-tree-ntuple-v7-ntuple-parallel-writer|\ -gtest-tree-ntuple-v7-ntuple-project|\ gtest-tree-ntuple-v7-ntuple-processor|\ +gtest-tree-ntuple-v7-ntuple-project|\ gtest-tree-ntuple-v7-ntuple-show|\ gtest-tree-ntuple-v7-ntuple-storage$$|\ gtest-tree-ntuple-v7-ntuple-storage-daos|\ @@ -2737,6 +2757,16 @@ excluded="${excluded}|\ gtest-math-matrix-testMatrixTSparse" %endif
+%if %{?fedora}%{!?fedora:0} >= 42 +# Fail with gcc 15 due to changes in std::hash templates +# - tutorial-roofit-*-py +# - tutorial-roostats-*-py +# https://github.com/root-project/root/issues/17456 +excluded="${excluded}|\ +tutorial-roofit-.*-py|\ +tutorial-roostats-.*-py" +%endif + # Filter out parts of tests that require remote network access # RNTuple.StdAtomic fails on ix86 (different alignment 64 bit (non)atomic) # TClingDataMemberInfo.Offset fails on s390x @@ -3659,6 +3689,11 @@ fi %endif
%changelog +* Fri Jan 31 2025 Mattias Ellert mattias.ellert@physics.uu.se - 6.34.02-5 +- Apply patches to fix build with gcc 15 +- Enable roofit-multiprocess for EPEL 10 (dependencies available) +- Rebuild for pythia8 8.3.13 + * Sat Jan 18 2025 Fedora Release Engineering releng@fedoraproject.org - 6.34.02-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
commit 2ad57ba760241d470f7bceebe3bc728b9edfe7d3 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Jan 18 22:37:32 2025 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
diff --git a/root.spec b/root.spec index dca3376..5e7d337 100644 --- a/root.spec +++ b/root.spec @@ -39,7 +39,7 @@ Name: root Version: 6.34.02 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numerical data analysis framework
License: LGPL-2.1-or-later @@ -3659,6 +3659,9 @@ fi %endif
%changelog +* Sat Jan 18 2025 Fedora Release Engineering releng@fedoraproject.org - 6.34.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Mattias Ellert mattias.ellert@physics.uu.se - 6.34.02-3 - Don't add dependencies on root-roofit-multiprocess and root-roofit-zmq to root-roofit-core for EPEL builds
commit 745e82c601a72e0f3a419549894a9fac3194c568 Author: Mattias Ellert mattias.ellert@physics.uu.se Date: Wed Jan 15 06:32:29 2025 +0100
Don't add dependencies on root-roofit-multiprocess and root-roofit-zmq to root-roofit-core for EPEL builds
diff --git a/root.spec b/root.spec index 431d547..dca3376 100644 --- a/root.spec +++ b/root.spec @@ -27,13 +27,19 @@ %global rrr 1 %endif
+%if %{?fedora}%{!?fedora:0} >= 40 +%global roofitmp 1 +%else +%global roofitmp 0 +%endif + # Do not generate autoprovides for Python modules %global __provides_exclude_from ^%{python3_sitearch}/lib.*\.so$
Name: root Version: 6.34.02 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numerical data analysis framework
License: LGPL-2.1-or-later @@ -171,7 +177,7 @@ BuildRequires: protobuf-devel >= 3.0 BuildRequires: libarrow-devel %endif %if %{roofit} -%if %{?fedora}%{!?fedora:0} >= 40 +%if %{roofitmp} # Required for roofit-multiprocess # Requires new zeromq with zmq_ppoll BuildRequires: zeromq-devel >= 4.3.5 @@ -410,7 +416,7 @@ Requires: %{name}-core = %{version}-%{release} # notebook package was merged with JupyROOT package Provides: %{name}-notebook = %{version}-%{release} Obsoletes: %{name}-notebook < 6.32.00 -Requires: js-jsroot >= 7.7 +Requires: js-jsroot >= 7.8 %if %{?fedora}%{!?fedora:0} # jupyter-notebook not available in RHEL/EPEL # some functionality missing @@ -1148,7 +1154,7 @@ access to http based storage such as webdav and S3. Summary: HTTP server extension for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} -Requires: js-jsroot >= 7.7 +Requires: js-jsroot >= 7.8 # Library split (net-httpsniff from net-http) Obsoletes: %{name}-net-http < 6.14.00
@@ -1290,8 +1296,10 @@ Requires: %{name}-matrix%{?_isa} = %{version}-%{release} Requires: %{name}-minuit%{?_isa} = %{version}-%{release} Requires: %{name}-minuit2%{?_isa} = %{version}-%{release} Requires: %{name}-roofit-batchcompute%{?_isa} = %{version}-%{release} +%if %{roofitmp} Requires: %{name}-roofit-multiprocess%{?_isa} = %{version}-%{release} Requires: %{name}-roofit-zmq%{?_isa} = %{version}-%{release} +%endif Requires: %{name}-tree%{?_isa} = %{version}-%{release} # Package split / Library split (from roofit) Obsoletes: %{name}-roofit < 6.20.00 @@ -1395,7 +1403,7 @@ suitable for adoption in different disciplines as well.
This package contains the JSON interface to RooFit.
-%if %{?fedora}%{!?fedora:0} >= 40 +%if %{roofitmp} %package roofit-multiprocess Summary: Multi-process support for RooFit License: BSD-2-Clause @@ -2130,7 +2138,7 @@ done %endif %if %{roofit} -Droofit:BOOL=ON \ -%if %{?fedora}%{!?fedora:0} >= 40 +%if %{roofitmp} -Droofit_multiprocess:BOOL=ON \ %else -Droofit_multiprocess:BOOL=OFF \ @@ -3397,7 +3405,7 @@ fi %{_libdir}/%{name}/libRooFitJSONInterface_rdict.pcm %dir %{_includedir}/%{name}/RooFit
-%if %{?fedora}%{!?fedora:0} >= 40 +%if %{roofitmp} %files roofit-multiprocess -f includelist-roofit-multiprocess %{_libdir}/%{name}/libRooFitMultiProcess.* %dir %{_includedir}/%{name}/RooFit @@ -3651,6 +3659,10 @@ fi %endif
%changelog +* Wed Jan 15 2025 Mattias Ellert mattias.ellert@physics.uu.se - 6.34.02-3 +- Don't add dependencies on root-roofit-multiprocess and root-roofit-zmq + to root-roofit-core for EPEL builds + * Sun Jan 12 2025 Mattias Ellert mattias.ellert@physics.uu.se - 6.34.02-2 - Adjust stressGraphics.ref - Build for EPEL 10
arch-excludes@lists.fedoraproject.org