From 37bb038cc96810b89f336b76e6d56b37794d6c6f Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Jun 13 2021 06:55:01 +0000
Subject: cmake in EPEL 8 no longer provides cmake3


---

diff --git a/root.spec b/root.spec
index 990c19a..51de763 100644
--- a/root.spec
+++ b/root.spec
@@ -45,7 +45,7 @@
 Name:		root
 Version:	6.22.08
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -162,7 +162,7 @@ Patch36:	%{name}-do-not-load_library-libROOTPythonizations.patch
 #		https://github.com/root-project/root/pull/6887
 Patch37:	%{name}-linux-vdso.patch
 #		Fix multicore tests when running on machines with few cores
-#		root-fix-multicore-tests-with-few-cores.patch
+#		https://github.com/root-project/root/pull/8068
 Patch38:	%{name}-fix-multicore-tests-with-few-cores.patch
 
 #		s390x suffers from endian issues resulting in failing tests
@@ -216,9 +216,12 @@ BuildRequires:	postgresql-devel
 %endif
 %if %{buildpy2}
 BuildRequires:	python2-devel
+BuildRequires:	python2-setuptools
+BuildRequires:	python2-numpy
 %endif
 BuildRequires:	python%{python3_pkgversion}-devel
 BuildRequires:	python%{python3_pkgversion}-setuptools
+BuildRequires:	python%{python3_pkgversion}-numpy
 %if %{root7}
 %ifarch %{qt5_qtwebengine_arches}
 BuildRequires:	qt5-qtbase-devel
@@ -259,7 +262,6 @@ BuildRequires:	cmake-data >= 3.18.3-1
 %else
 BuildRequires:	openblas-devel
 %endif
-BuildRequires:	python%{python3_pkgversion}-numpy
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	yuicompressor
@@ -2410,7 +2412,11 @@ for f in `find %{_vpath_builddir} -name cmake_install.cmake -a '!' -path '*/llvm
     l=`sed 's!%{_vpath_builddir}/\(.*\)/cmake_install.cmake!includelist-\1!' <<< $f`
     l=`tr / - <<< $l`
     tmpdir=`mktemp -d`
+%if %{?rhel}%{!?rhel:0} == 7
     DESTDIR=$tmpdir cmake3 -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+%else
+    DESTDIR=$tmpdir cmake -DCMAKE_INSTALL_COMPONENT=headers -P $f > /dev/null
+%endif
     ( cd $tmpdir ; find . -type f) | sort | sed 's!^\.!!' > $l
     rm -rf $tmpdir
 done
@@ -3517,6 +3523,9 @@ fi
 %endif
 
 %changelog
+* Sun Jun 13 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.22.08-7
+- cmake in EPEL 8 no longer provides cmake3
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.22.08-6
 - Rebuilt for Python 3.10