From 0172e0c499ce31d4c194a16abb01634d4cf13f1c Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Aug 30 2019 07:20:16 +0000
Subject: Update to 6.18.02

Add workarounds for issues caused by the RHEL 7.7 update, that left the
  aarch64 architecture at RHEL 7.6.

---

diff --git a/root.spec b/root.spec
index 4330068..f477501 100644
--- a/root.spec
+++ b/root.spec
@@ -16,7 +16,7 @@
 %global __pythondef %{__python2}
 %endif
 
-%if %{?fedora}%{!?fedora:0} >= 31
+%if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8
 # Don't build python2-root for Fedora >= 31
 %global buildpy2 0
 %else
@@ -49,9 +49,9 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
 
 Name:		root
-Version:	6.18.00
+Version:	6.18.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -282,13 +282,8 @@ This package contains icons used by the ROOT GUI.
 %package fonts
 Summary:	ROOT font collection
 BuildArch:	noarch
-%if %{?rhel}%{!?rhel:0}
-#		STIX version 0.9 and Driod Sans Fallback
-License:	OFL and ASL 2.0
-%else
 #		STIX version 0.9 only
 License:	OFL
-%endif
 Requires:	%{name}-core = %{version}-%{release}
 
 %description fonts
@@ -297,7 +292,15 @@ In particular it contains STIX version 0.9 that is used by TMathText.
 
 %package doc
 Summary:	Documentation for the ROOT system
+%if %{?rhel}%{!?rhel:0} != 7
+#		RHEL 7 is now RHEL 7.7, but aarch64 is stuck on RHEL 7.6.
+#		Differences in graphics libraries (SVG support in doxygen)
+#		between the releases result in that the content of the
+#		documentation package differs between architectures in such a
+#		way that the build is rejected as invalid if the documentation
+#		package is noarch. Don't declare the package noarch in EPEL 7.
 BuildArch:	noarch
+%endif
 License:	LGPLv2+ and GPLv2+ and BSD
 Requires:	mathjax
 
@@ -452,8 +455,8 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python2-jsmva
 Summary:	TMVA interface used by JupyROOT
-%{?python_provide:%python_provide python2-jsmva}
 BuildArch:	noarch
+%{?python_provide:%python_provide python2-jsmva}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python2-jsmva
@@ -463,6 +466,12 @@ TMVA interface used by JupyROOT.
 %package -n python%{python3_pkgversion}-%{name}
 Summary:	Python extension for ROOT
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch aarch64
+#		Workaround broken RHEL 7 aarch64
+Provides:	python3-%{name} = %{version}-%{release}
+%endif
+%endif
 Provides:	%{name}-python%{python3_pkgversion} = %{version}-%{release}
 Obsoletes:	%{name}-python%{python3_pkgversion} < 6.08.00
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -476,6 +485,12 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 %package -n python%{python3_pkgversion}-jupyroot
 Summary:	ROOT Jupyter kernel
 %{?python_provide:%python_provide python%{python3_pkgversion}-jupyroot}
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch aarch64
+#		Workaround broken RHEL 7 aarch64
+Provides:	python3-jupyroot = %{version}-%{release}
+%endif
+%endif
 Requires:	python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release}
 Requires:	python%{python3_pkgversion}-jsmva = %{version}-%{release}
 Requires:	%{name}-core%{?_isa} = %{version}-%{release}
@@ -495,8 +510,14 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
-%{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
 BuildArch:	noarch
+%{?python_provide:%python_provide python%{python3_pkgversion}-jsmva}
+%if %{?rhel}%{!?rhel:0} == 7
+%ifarch aarch64
+#		Workaround broken RHEL 7 aarch64
+Provides:	python3-jsmva = %{version}-%{release}
+%endif
+%endif
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_pkgversion}-jsmva
@@ -528,8 +549,8 @@ The Jupyter kernel for the ROOT notebook.
 
 %package -n python%{python3_other_pkgversion}-jsmva
 Summary:	TMVA interface used by JupyROOT
-%{?python_provide:%python_provide python%{python3_other_pkgversion}-jsmva}
 BuildArch:	noarch
+%{?python_provide:%python_provide python%{python3_other_pkgversion}-jsmva}
 Requires:	%{name}-tmva = %{version}-%{release}
 
 %description -n python%{python3_other_pkgversion}-jsmva
@@ -3646,6 +3667,11 @@ fi
 %endif
 
 %changelog
+* Mon Aug 26 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.18.02-1
+- Update to 6.18.02
+- Add workarounds for issues caused by the RHEL 7.7 update, that left the
+  aarch64 architecture at RHEL 7.6.
+
 * Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 6.18.00-5
 - Rebuilt for GSL 2.6.
 
diff --git a/sources b/sources
index e1e5742..8289c06 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.18.00.tar.xz) = d7e34c04f22ed2f3a6caf94263126c296df7fda176fc644a166ac47f93663134bd3b34c5d1dfb99cf84071eb93a08602b1cb0a8526610993f099fd3161c897c7
+SHA512 (root-6.18.02.tar.xz) = fe9ab15282f112b8a322e2b25fd15f7703055bcdc2de9f0a3a4457b1e727a172d122d4613faf84ccc27fe4149dc4489f62ee4dac3189c44ad3376e1c81186c28
 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e