rpms/root
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 6.26.02

Browse source 
Drop patch root-roofit-overflow.patch (previously backported)
This commit is contained in:
Mattias Ellert 2022-04-18 04:04:24 +02:00
commit 4a99ec915c
3 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
root-old-gtest-compat.patch
View file

@ -414,3 +414,30 @@ index 7b6b7647aa..77f125ca60 100644
--
2.35.1
From 33e5da8c1f678382ab2fd65d000d388bb0dbf3ab Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sun, 17 Apr 2022 22:17:56 +0200
Subject: [PATCH] Backward compatibility with older googletest versions in EPEL
---
math/vecops/test/vecops_rvec.cxx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/math/vecops/test/vecops_rvec.cxx b/math/vecops/test/vecops_rvec.cxx
index 7b513a858b..bea39636ce 100644
--- a/math/vecops/test/vecops_rvec.cxx
+++ b/math/vecops/test/vecops_rvec.cxx
@@ -13,6 +13,10 @@
#include <sstream>
#include <cmath>
+#ifndef INSTANTIATE_TEST_SUITE_P
+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
+#endif
+
using namespace ROOT;
using namespace ROOT::VecOps;
using namespace ROOT::Detail::VecOps; // for `IsSmall` and `IsAdopting`
--
2.35.1

16
root.spec
View file

@ -68,7 +68,7 @@
%global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch})/lib.*\\.so$
Name: root
Version: 6.26.00
Version: 6.26.02
%global libversion %(cut -d. -f 1-2 <<< %{version})
Release: 1%{?dist}
Summary: Numerical data analysis framework
@ -180,10 +180,9 @@ Patch30: %{name}-tmva-threads.patch
# https://github.com/root-project/root/pull/10313
Patch31: %{name}-core-base-test.patch
# Backports
Patch32: %{name}-roofit-overflow.patch
Patch33: %{name}-make-dyld-based-library-search-behavior-default.patch
Patch34: %{name}-fix-TMVA-tutorial-using-internally-python.patch
Patch35: %{name}-threadsh1-avoid-heap-use-after-free.patch
Patch32: %{name}-make-dyld-based-library-search-behavior-default.patch
Patch33: %{name}-fix-TMVA-tutorial-using-internally-python.patch
Patch34: %{name}-threadsh1-avoid-heap-use-after-free.patch
%if %{?rhel}%{!?rhel:0} == 7
BuildRequires: devtoolset-8-toolchain
@ -2042,7 +2041,6 @@ This package contains an ntuple extension for ROOT 7.
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
# Remove bundled sources in order to be sure they are not used
# * afterimage
@ -3944,8 +3942,12 @@ fi
%endif
%changelog
* Thu Apr 14 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.02-1
- Update to 6.26.02
- Drop patch root-roofit-overflow.patch (previously backported)
* Sat Mar 26 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.26.00-1
- Update to 6.24.04
- Update to 6.26.00
- New subpackages: root-roofit-common, root-roofit-dataframe-helpers,
root-roofit-hs3, root-tmva-sofie and root-tmva-sofie-parser
- Removed subpackages: root-memstat and root-montecarlo-vmc

2
sources
View file

@ -1,2 +1,2 @@
SHA512 (root-6.26.00.tar.xz) = 0a98e973eeda98550200635d5d566fe4191aba953d3f993af750761a23e2b86caa5eb9674837bf1b070b9056b3a8ce7ee2d43295c56d22d120ca78edb97ea1c8
SHA512 (root-6.26.02.tar.xz) = 016b1176564ba31f9ac22c9b62cdd11ba9dda2e6d656c587d0b77e57c8a34d52343ba5da8ecf185c0a73ded80109a5cd28438611441ba5ee6ab14ba986ed3b94
SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f