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=d5f9a3e4ced66....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit d5f9a3e4ced6692d4429ab2393b3a1fcf144fadd
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Mon Jun 15 08:33:47 2020 +0200
Update to 6.20.06
Fix test failure on ppc64le and aarch64
diff --git a/root-roostats-test-ppc64le-aarch64.patch
b/root-roostats-test-ppc64le-aarch64.patch
new file mode 100644
index 0000000..b88d052
--- /dev/null
+++ b/root-roostats-test-ppc64le-aarch64.patch
@@ -0,0 +1,34 @@
+From 357ac50a2420a4544c9c63594cccb994ee14f870 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Sat, 13 Jun 2020 14:23:15 +0200
+Subject: [PATCH] The roofit/roostats/test/testHypoTestInvResult.cxx test fails
+ on aarch64 and ppc64le. This commit adjusts the allowed deviation from the
+ expected value so that the test passes.
+
+The reported error is (with slight variations in the exact numbers):
+
+/builddir/build/BUILD/root-6.20.06/roofit/roostats/test/testHypoTestInvResult.cxx:24:
Failure
+The difference between result->UpperLimitEstimatedError() and 0.059684301 is
1.1846561807221656e-07, which exceeds 1.E-8, where
+result->UpperLimitEstimatedError() evaluates to 0.05968418253438193,
+0.059684301 evaluates to 0.059684301000000002, and
+1.E-8 evaluates to 1e-08.
+---
+ roofit/roostats/test/testHypoTestInvResult.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/roofit/roostats/test/testHypoTestInvResult.cxx
b/roofit/roostats/test/testHypoTestInvResult.cxx
+index 9c2896185a..b89eab9b69 100644
+--- a/roofit/roostats/test/testHypoTestInvResult.cxx
++++ b/roofit/roostats/test/testHypoTestInvResult.cxx
+@@ -21,7 +21,7 @@ TEST(HypoTestInvResult, ReadFromFile)
+
+ // This just reads members
+ EXPECT_NEAR(result->UpperLimit(), 2.4613465, 1.E-7);
+- EXPECT_NEAR(result->UpperLimitEstimatedError(), 0.059684301, 1.E-8);
++ EXPECT_NEAR(result->UpperLimitEstimatedError(), 0.059684301, 2.E-7);
+
+ // This accesses the sampling distribution
+ EXPECT_DOUBLE_EQ(result->GetExpectedUpperLimit(0), 1.60988427028569);
+--
+2.26.2
+
diff --git a/root.spec b/root.spec
index bfda37a..60eba85 100644
--- a/root.spec
+++ b/root.spec
@@ -49,9 +49,9 @@
%global __provides_exclude_from
^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
Name: root
-Version: 6.20.04
+Version: 6.20.06
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
License: LGPLv2+
@@ -129,6 +129,9 @@ Patch19: %{name}-moved-file.patch
# EPEL7 ppc64le
#
https://sft.its.cern.ch/jira/browse/ROOT-10622
Patch20: %{name}-epel7-ppc64le-pyroot.patch
+# Fix test failure on ppc64le and aarch64
+#
https://github.com/root-project/root/pull/5867
+Patch21: %{name}-roostats-test-ppc64le-aarch64.patch
# s390x suffers from endian issues resulting in failing tests
# and broken documentation generation
@@ -1843,6 +1846,7 @@ This package contains an ntuple extension for ROOT 7.
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p1
# Remove bundled sources in order to be sure they are not used
# * afterimage
@@ -2128,6 +2132,7 @@ else
py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e
's/\s*$//'`
fi
sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+ -e
"s,%{_libdir}/python%{python2_version}/config/lib${py2l}.so,%{_libdir}/lib${py3l}.so,g"
\
-e "s,lib${py2l},lib${py3l},g" \
-e 's,%{__python}%{python2_version},%{__python3},g' \
-e 's,%{__python2},%{__python3},g' \
@@ -2157,6 +2162,7 @@ else
py3l=`pkg-config --libs-only-l python-%{python3_other_version} | sed -e
's/-l//' -e 's/\s*$//'`
fi
sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \
+ -e
"s,%{_libdir}/python%{python2_version}/config/lib${py2l}.so,%{_libdir}/lib${py3l}.so,g"
\
-e "s,lib${py2l},lib${py3l},g" \
-e 's,%{__python}%{python2_version},%{__python3_other},g' \
-e 's,%{__python2},%{__python3_other},g' \
@@ -2629,7 +2635,7 @@ popd
# - gtest-net-davix-test-RRawFileDavix
# reads input file over network
#
http://root.cern.ch/files/davix.test
-# (*) one subtest RRawFile.Remote fails, others woud be OK
+# (*) one subtest RRawFile.Remote fails, others would be OK
#
# - gtest-tmva-tmva-test-rreader
# - gtest-tmva-tmva-test-rstandardscaler
@@ -2676,6 +2682,7 @@ tutorial-tmva-tmva103_Application"
# - gtest-tree-dataframe-test-dataframe-friends
# - gtest-tree-dataframe-test-dataframe-helpers
# - gtest-tree-dataframe-test-dataframe-interface
+# - gtest-tree-dataframe-test-dataframe-ranges
# - gtest-tree-dataframe-test-dataframe-simple
# - gtest-tree-dataframe-test-dataframe-snapshot
# - gtest-tree-dataframe-test-datasource-root
@@ -2687,6 +2694,7 @@ gtest-tree-dataframe-test-dataframe-colnames|\
gtest-tree-dataframe-test-dataframe-friends|\
gtest-tree-dataframe-test-dataframe-helpers|\
gtest-tree-dataframe-test-dataframe-interface|\
+gtest-tree-dataframe-test-dataframe-ranges|\
gtest-tree-dataframe-test-dataframe-simple|\
gtest-tree-dataframe-test-dataframe-snapshot|\
gtest-tree-dataframe-test-datasource-root|\
@@ -2694,19 +2702,17 @@ gtest-tree-dataframe-test-datasource-trivial"
%endif
%ifarch %{arm}
-# Tests failing on 32 bit arm
+# This test fails on 32 bit arm
# - gtest-tree-tree-test-testBulkApiSillyStruct
excluded="${excluded}|gtest-tree-tree-test-testBulkApiSillyStruct"
%endif
-%ifarch ppc64le
-%if %{?fedora}%{!?fedora:0} == 29 || %{?fedora}%{!?fedora:0} == 30
-# This test fails on Fedora 29 and 30 ppc64le with the following error:
-# cling::DynamicLibraryManager::loadLibrary():
-# /lib64/libGLdispatch.so.0: cannot allocate memory in static TLS block
-# Error in <TInterpreter::TCling::AutoLoad>:
-# failure loading library libRGL.so for TGLHistPainter
-excluded="${excluded}|tutorial-roofit-rf608_fitresultaspdf-py"
+%ifarch %{ix86} x86_64
+%if %{?fedora}%{!?fedora:0}
+# This test fails on ix86 and x86_64 for Fedora 31/32/33 in koji
+# I can not reproduce the failure in a local mock build
+# - tutorial-roofit-rf611_weightedfits
+excluded="${excluded}|tutorial-roofit-rf611_weightedfits"
%endif
%endif
@@ -3080,7 +3086,7 @@ fi
%{_pkgdocdir}/LICENSE
%doc %{_pkgdocdir}/README
%doc %{_pkgdocdir}/ReleaseNotes
-%license LICENSE
+%license LICENSE LGPL2_1.txt
%files multiproc -f includelist-core-multiproc
%{_libdir}/%{name}/libMultiProc.*
@@ -3781,6 +3787,10 @@ fi
%endif
%changelog
+* Thu Jun 11 2020 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.20.06-1
+- Update to 6.20.06
+- Fix test failure on ppc64le and aarch64
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 6.20.04-3
- Rebuilt for Python 3.9
@@ -4599,7 +4609,7 @@ fi
- Enable dCache support - dcap library is now in Fedora
- Use system unuran library instead of embedded sources
-* Mon Feb 1 2010 Mattias Ellert <mattias.ellert(a)fysast.uu.se> - 5.26.00a-1
+* Mon Feb 01 2010 Mattias Ellert <mattias.ellert(a)fysast.uu.se> - 5.26.00a-1
- Update to 5.26.00a
- Disable cintex package for non-intel architectures
- Remove embedded gl2ps sources
diff --git a/sources b/sources
index acda19b..86bdac6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.20.04.tar.xz) =
9e864e1b4c772871bdadec53b40ccce05fd537f04321b301ca78ad1e711e332b278e76bcd7673a6a11ef4dbac18bee8c24ae65cc7fe962e5e8b63630bdc62f27
+SHA512 (root-6.20.06.tar.xz) =
791f472cb40200c5f8b79efd1803044914bb8e41dc1f424e90508c059d548be7913417a08a770e0f041c9070af8dc6bbddf5366c3db2b1dac43d417992aade22
SHA512 (root-testfiles.tar.xz) =
7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e
commit 52746b4384e5882813c2cee3d9f26e741138da6e
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue May 26 03:49:26 2020 +0200
Rebuilt for Python 3.9
diff --git a/root.spec b/root.spec
index 6c23168..bfda37a 100644
--- a/root.spec
+++ b/root.spec
@@ -51,7 +51,7 @@
Name: root
Version: 6.20.04
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Numerical data analysis framework
License: LGPLv2+
@@ -3781,6 +3781,9 @@ fi
%endif
%changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 6.20.04-3
+- Rebuilt for Python 3.9
+
* Fri Apr 10 2020 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.20.04-2
- Replace BR qt5-devel with qt5-qtbase-devel