diff --git a/root-add-flexiblas-detection.patch b/root-add-flexiblas-detection.patch deleted file mode 100644 index bcf8063..0000000 --- a/root-add-flexiblas-detection.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2f3c530cd8c8b9adc0303e2ae24a069f671aee1c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= -Date: Sun, 16 Aug 2020 13:46:21 +0200 -Subject: [PATCH] add flexiblas detection - ---- - cmake/modules/SearchInstalledSoftware.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake -index f1c6ee27..12aa822f 100644 ---- a/cmake/modules/SearchInstalledSoftware.cmake -+++ b/cmake/modules/SearchInstalledSoftware.cmake -@@ -1496,7 +1496,13 @@ endif() - if(tmva) - if(tmva-cpu AND imt) - message(STATUS "Looking for BLAS for optional parts of TMVA") -- find_package(BLAS) -+ pkg_check_modules(FLEXIBLAS flexiblas) -+ set(BLAS_FOUND ${FLEXIBLAS_FOUND}) -+ set(BLAS_LIBRARIES "${FLEXIBLAS_LIBRARIES}") -+ set(BLAS_LINKER_FLAGS) -+ if (NOT BLAS_FOUND) -+ find_package(BLAS) -+ endif() - if(NOT BLAS_FOUND) - if (GSL_FOUND) - message(STATUS "Using GSL CBLAS for optional parts of TMVA") --- -2.25.2 - diff --git a/root.spec b/root.spec index 9a17191..67e2349 100644 --- a/root.spec +++ b/root.spec @@ -36,12 +36,6 @@ %global tbb 0 %endif -%if %{?fedora}%{!?fedora:0} >= 33 -%global blaslib flexiblas -%else -%global blaslib openblas -%endif - # Do not create .orig files when patching source %global _default_patch_flags --no-backup-if-mismatch @@ -51,7 +45,7 @@ Name: root Version: 6.22.02 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -152,8 +146,9 @@ Patch31: %{name}-fix-bad-regex.patch # Compatibility with xrootd 5 # https://github.com/root-project/root/pull/6031 Patch32: %{name}-xrootd5-compat.patch -# Enable FlexiBLAS detection -Patch33: %{name}-add-flexiblas-detection.patch +# Only install the xproofd script and man page if option is on +# https://github.com/root-project/root/pull/6281 +Patch33: %{name}-xproofd.patch # Avoid unneeded build requirement on srm-ifce-devel # https://github.com/root-project/root/pull/6233 Patch34: %{name}-srm-ifce-deps.patch @@ -163,9 +158,6 @@ Patch35: %{name}-fix-a-shadow-warning.patch # Increase timeout for ppc64le # https://github.com/root-project/root/pull/6246 Patch36: %{name}-increase-timeout-for-ppc64le.patch -# Only install the xproofd script and man page if option is on -# https://github.com/root-project/root/pull/6281 -Patch37: %{name}-xproofd.patch # s390x suffers from endian issues resulting in failing tests # and broken documentation generation @@ -225,8 +217,12 @@ BuildRequires: openssl-devel BuildRequires: libtool-ltdl-devel BuildRequires: desktop-file-utils BuildRequires: dcap-devel +%if %{xrootd5} +BuildRequires: xrootd-client-devel >= 1:5.0.0 +%else BuildRequires: xrootd-client-devel >= 1:3.3.5 BuildRequires: xrootd-private-devel >= 1:3.3.5 +%endif BuildRequires: cfitsio-devel BuildRequires: davix-devel >= 0.2.8 BuildRequires: gfal2-devel @@ -243,7 +239,14 @@ BuildRequires: gcc-gfortran BuildRequires: graphviz-devel BuildRequires: expat-devel BuildRequires: pythia8-devel >= 8.1.80 -BuildRequires: %{blaslib}-devel +%if %{?fedora}%{!?fedora:0} >= 33 +BuildRequires: flexiblas-devel +# Required for FlexiBLAS support in FindBLAS.cmake +# (in cmake 3.19.0, backported to cmake 3.18.3-1 in Fedora) +BuildRequires: cmake-data >= 3.18.3-1 +%else +BuildRequires: openblas-devel +%endif BuildRequires: python%{python3_pkgversion}-numpy BuildRequires: doxygen BuildRequires: graphviz @@ -1874,7 +1877,6 @@ This package contains an ntuple extension for ROOT 7. %patch34 -p1 %patch35 -p1 %patch36 -p1 -%patch37 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -2367,48 +2369,6 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../%{_vpath_builddir}/bin:${PATH} \ mv doc/html %{buildroot}%{_pkgdocdir}/html popd -%if %{?fedora}%{!?fedora:0} >= 31 -# Workaround for doxygen 1.8.17 and later doing slightly different things -# on 32 and 64 bit -for f in \ - classDouble__t.html \ - classPdfCacheElem.html \ - classPdfCacheElem__inherit__graph.map \ - classPdfCacheElem__inherit__graph.md5 \ - classPdfCacheElem__inherit__graph.svg \ - classROOT_1_1Experimental_1_1REveMagFieldDuo__coll__graph_org.svg \ - classROOT_1_1Fit_1_1BasicFCN__coll__graph_org.svg \ - classROOT_1_1Math_1_1Delaunay2D__coll__graph_org.svg \ - classROOT_1_1Math_1_1MemGradFunHandler__coll__graph_org.svg \ - classTAttImage__coll__graph_org.svg \ - classTDecompQRH__coll__graph_org.svg \ - classTDecompSVD__coll__graph_org.svg \ - classTImagePalette__coll__graph_org.svg \ - classTMVA_1_1CrossValidationResult__coll__graph_org.svg \ - classTQpDataBase__coll__graph_org.svg \ - classTQpLinSolverBase__coll__graph_org.svg \ - classTQpResidual__coll__graph_org.svg \ - classunsigned_01int.html \ - inherit_graph_1794.map \ - inherit_graph_1794.md5 \ - inherit_graph_1794.svg \ - inherit_graph_1798.map \ - inherit_graph_1798.md5 \ - inherit_graph_1798.svg \ - structEvent__t__coll__graph_org.svg \ - structGLUvertex__coll__graph_org.svg \ - structROOT_1_1Experimental_1_1REveBoxSet_1_1BEllipticCone__t__coll__graph_org.svg \ - structROOT_1_1Experimental_1_1REveBoxSet_1_1BOrigin__t__inherit__graph_org.svg \ - structROOT_1_1Experimental_1_1REveDigitSet_1_1DigitBase__t__inherit__graph_org.svg \ - structROOT_1_1Internal_1_1RootCling_1_1DriverConfig__coll__graph_org.svg \ - structTEveDigitSet_1_1DigitBase__t__inherit__graph.map \ - structTEveDigitSet_1_1DigitBase__t__inherit__graph.md5 \ - structTEveDigitSet_1_1DigitBase__t__inherit__graph.svg ; do - [ -r %{buildroot}%{_pkgdocdir}/html/${f} ] || \ - touch %{buildroot}%{_pkgdocdir}/html/${f} -done -%endif - # Create includelist files ... for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm/*'` ; do l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f` @@ -3534,6 +3494,13 @@ fi %endif %changelog +* Fri Oct 02 2020 Mattias Ellert - 6.22.02-3 +- Drop obsolete patch root-add-flexiblas-detection.patch (cmake's + FindBLAS.cmake supports flexiblas now) +- Drop the workaround for the bug in doxygen causing different results + on 32 and 64 bit architectures (use doxygen < 1.8.17 or >= 1.8.20-3) +- Build require xrootd 5 (Fedora 33+, EPEL 7+) + * Sun Aug 30 2020 Mattias Ellert - 6.22.02-2 - Adapt to xrootd 5 (Fedora 33+, EPEL 7+) - Don't build the old proof client (xproofd) @@ -3595,6 +3562,8 @@ fi - Fix doxygen issues - Fix bad regex in TProofMgr - Compatibility with xrootd 5 +- Add workaround for a bug in doxygen 1.8.17 and later causing different + results on 32 and 64 bit * Sat Jul 11 2020 Jeff Law - 6.20.06-2 - Disable LTO