diff --git a/root-Fix-constructing-the-GSL-MC-Integrator.patch b/root-Fix-constructing-the-GSL-MC-Integrator.patch deleted file mode 100644 index 8615550..0000000 --- a/root-Fix-constructing-the-GSL-MC-Integrator.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0bed472bc529c6fa515793984808a4f6c24fc715 Mon Sep 17 00:00:00 2001 -From: moneta -Date: Mon, 15 Jan 2018 15:00:44 +0100 -Subject: [PATCH] Fix constructing the GSL MC Integrator. This fix the failure - observed sometimes in math core-testIntegration. (Fix ROOT-9178) - ---- - math/mathmore/src/GSLMCIntegrator.cxx | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/math/mathmore/src/GSLMCIntegrator.cxx b/math/mathmore/src/GSLMCIntegrator.cxx -index 25ad7b4eac..1c00146630 100644 ---- a/math/mathmore/src/GSLMCIntegrator.cxx -+++ b/math/mathmore/src/GSLMCIntegrator.cxx -@@ -100,6 +100,7 @@ GSLMCIntegrator::GSLMCIntegrator(MCIntegration::Type type, double absTol, double - } - - GSLMCIntegrator::GSLMCIntegrator(const char * type, double absTol, double relTol, unsigned int calls): -+ fType(MCIntegration::kDEFAULT), - fDim(0), - fCalls(calls), - fAbsTol(absTol), -@@ -316,7 +317,8 @@ void GSLMCIntegrator::SetTypeName(const char * type) - } - - // create the fWorkspace object -- if (integType != fType) SetType(integType); -+ // if it exists already with the same type it will not be re-created -+ SetType(integType); - } - - --- -2.14.3 - diff --git a/root-noinst.patch b/root-noinst.patch index 4f3212f..88bdb67 100644 --- a/root-noinst.patch +++ b/root-noinst.patch @@ -29,7 +29,7 @@ index 2758edb08e1..d98ac3b6331 100644 +ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC NOINSTALL) target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}) - # Disable optimization since it some cases was causing crashes + # Disable optimization since it some cases was causing crashes. From 9bd8d4e52fae5467867cbcf1810bc58a63b55a62 Mon Sep 17 00:00:00 2001 From: Mattias Ellert diff --git a/root.spec b/root.spec index 577c43d..ddafd9f 100644 --- a/root.spec +++ b/root.spec @@ -31,9 +31,9 @@ %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$ Name: root -Version: 6.12.04 +Version: 6.12.06 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 4%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -92,27 +92,24 @@ Patch13: %{name}-memory-arm.patch # Ensures content of doc package is the same on all architecture # so that koji accepts it as a noarch package. Patch14: %{name}-ppc64-doc.patch -# Fix constructing the GSL MC Integrator -# Backport from upstream git -Patch15: %{name}-Fix-constructing-the-GSL-MC-Integrator.patch # Check string is not empty before calling front() # Backport from upstream git -Patch16: %{name}-crash-fix.patch +Patch15: %{name}-crash-fix.patch # Adjust expected file size for ix32 # Backport from upstream git -Patch17: %{name}-test-stress-32bit.patch +Patch16: %{name}-test-stress-32bit.patch # Fixes for failing tests due to new compiler flags # https://github.com/root-project/root/pull/1638 -Patch18: %{name}-test-fixes.patch +Patch17: %{name}-test-fixes.patch # https://github.com/root-project/root/pull/1639 -Patch19: %{name}-out-of-bounds.patch +Patch18: %{name}-out-of-bounds.patch # Fix ~ alignment in doxygen markup # https://github.com/root-project/root/pull/1640 -Patch20: %{name}-doxygen-tilde.patch +Patch19: %{name}-doxygen-tilde.patch # Don't install intermediate static libs (mathtext and minicern) # Don't add JupyROOT python extension to cmake exports # https://github.com/root-project/root/pull/1643 -Patch21: %{name}-noinst.patch +Patch20: %{name}-noinst.patch # s390x suffers from endian issues resulting in failing tests # and broken documentation generation @@ -225,7 +222,11 @@ BuildRequires: font(freesans) BuildRequires: font(freeserif) BuildRequires: font(freemono) # Provides "symbol", "dingbats" and "chancery" +%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8 +BuildRequires: urw-base35-fonts +%else BuildRequires: urw-fonts +%endif # The root-fonts package provides Droid Sans Fallback for EPEL %if %{?fedora}%{!?fedora:0} >= 11 BuildRequires: font(droidsansfallback) @@ -349,7 +350,11 @@ Requires: font(freesans) Requires: font(freeserif) Requires: font(freemono) # Provides "symbol", "dingbats" and "chancery" +%if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8 +Requires: urw-base35-fonts +%else Requires: urw-fonts +%endif # The root-fonts package provides Droid Sans Fallback for EPEL %if %{?fedora}%{!?fedora:0} >= 11 Requires: font(droidsansfallback) @@ -1683,7 +1688,6 @@ Javascript and style files for the Jupyter ROOT Notebook. %patch18 -p1 %patch19 -p1 %patch20 -p1 -%patch21 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -2307,6 +2311,16 @@ excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistof excluded="${excluded}|test-stresshistogram" %endif +# Test failing on 32 bit on Fedora <= 27 +# https://sft.its.cern.ch/jira/browse/ROOT-9236 +# https://sft.its.cern.ch/jira/browse/ROOT-9265 +# - gtest-tree-treeplayer-test-dataframe-snapshot +%ifarch %{ix86} %{arm} +%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7 +excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot" +%endif +%endif + make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\"" popd @@ -3388,6 +3402,11 @@ end %{_datadir}/%{name}/notebook %changelog +* Sat Feb 17 2018 Mattias Ellert - 6.12.06-1 +- Update to 6.12.06 +- Drop patch root-Fix-constructing-the-GSL-MC-Integrator.patch (previously + backported) + * Fri Feb 16 2018 Mattias Ellert - 6.12.04-4 - Fix test failures found with new default compiler flags in Fedora 28 diff --git a/sources b/sources index 498a567..da8883b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (root-6.12.04.tar.xz) = 271cc151073f0b147f4e4f5030f71e3782723be1e5c36c431b85086e8280dbdab1fde22c4f5c26e5f8d821ed309d4b7db5e846ec383db84d64714d0c627c8c7a +SHA512 (root-6.12.06.tar.xz) = 607644b5cd06fdab5e0899172156cbed92911de9d1eef2695cc79c5f41621a2d1167a6d14791c5b97c8d15dcb7d4d45952b3dcf4ffb096dc51bdeb3233b5467f SHA512 (root-testfiles.tar.xz) = f697afb666c1081f98cfe66fe21998c4eab86c25a3671ff71a4ac98610d70f70081d70b40029a0b788b39d87c542b5aa4e31d71f7be494f4774323ed20e9bccb