From c2cd7682c3bcdf161e4c7632f702f9112418c3b0 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <ellert@ellert.se>
Date: Feb 01 2024 06:40:40 +0000
Subject: Update to 6.30.04


Drop patch root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
  (accepted upstrem)
Exclude failing TClingDataMemberInfo.Offset test on s390x

---

diff --git a/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch b/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
deleted file mode 100644
index 05f7fa6..0000000
--- a/root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8e6b901646c0a4139b9f6f18c5d6cd5c98614136 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 2 Dec 2023 18:50:04 +0100
-Subject: [PATCH] Adjust test for failures on aarch64, ppc64le and s390x
-
-[ RUN      ] RooTruthModel.IntegrateSubrange
-[#1] INFO:Eval -- RooRealVar::setRange(dt) new range named 'integral' created with bounds [2,2]
-/builddir/build/BUILD/root-6.30.02/roofit/roofitcore/test/testRooTruthModel.cxx:38: Failure
-Expected equality of these values:
-  integ->getVal()
-    Which is: -2.8822093e-17
-  0.0
-    Which is: 0
-[  FAILED  ] RooTruthModel.IntegrateSubrange (194 ms)
----
- roofit/roofitcore/test/testRooTruthModel.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/roofit/roofitcore/test/testRooTruthModel.cxx b/roofit/roofitcore/test/testRooTruthModel.cxx
-index a97fcb7c4e..ff3464a880 100644
---- a/roofit/roofitcore/test/testRooTruthModel.cxx
-+++ b/roofit/roofitcore/test/testRooTruthModel.cxx
-@@ -35,5 +35,5 @@ TEST(RooTruthModel, IntegrateSubrange)
-    dt.setRange("integral", 2, 2);
- 
-    std::unique_ptr<RooAbsReal> integ{bcpg.createIntegral({dt}, "integral")};
--   EXPECT_FLOAT_EQ(integ->getVal(), 0.0);
-+   EXPECT_NEAR(integ->getVal(), 0.0, 1e-16);
- }
--- 
-2.43.0
-
diff --git a/root.spec b/root.spec
index c116b12..063bdbe 100644
--- a/root.spec
+++ b/root.spec
@@ -45,9 +45,9 @@
 %global __provides_exclude_from ^%{python3_sitearch}/lib.*\\.so$
 
 Name:		root
-Version:	6.30.02
+Version:	6.30.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	9%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -105,13 +105,11 @@ Patch11:	%{name}-avoid-out-of-memory-during-linking.patch
 Patch12:	%{name}-clad.patch
 Patch13:	%{name}-gtest-back.patch
 Patch14:	%{name}-np32.patch
-#		https://github.com/root-project/root/pull/14164
-Patch15:	%{name}-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
-#		Only for EPEL 8 - disable tests not working with old gtest
-Patch16:	%{name}-old-gtest.patch
 #		Adjust tests for zlib-ng
 #		https://github.com/root-project/root/pull/14295
-Patch17:	%{name}-new-zlib.patch
+Patch15:	%{name}-new-zlib.patch
+#		Only for EPEL 8 - disable tests not working with old gtest
+Patch16:	%{name}-old-gtest.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-gfortran
@@ -2005,7 +2003,6 @@ This package contains utility functions for ntuples.
 %if %{?rhel}%{!?rhel:0} == 8
 %patch -P 16 -p1
 %endif
-%patch -P 17 -p1
 
 # Remove bundled sources in order to be sure they are not used
 #  * afterimage
@@ -2818,6 +2815,8 @@ gtest-math-matrix-test-testMatrixTSparse"
 %endif
 
 # Filter out parts of tests that require remote network access
+# TClingDataMemberInfo.Offset fails on s390x
+# https://github.com/root-project/root/issues/14512
 # RNTuple.TClassEBO seg fault
 # https://github.com/root-project/root/issues/12428
 GTEST_FILTER=-\
@@ -2827,6 +2826,9 @@ RSqliteDS.Davix:\
 TChainParsing.RemoteGlob:\
 TFile.ReadWithoutGlobalRegistrationNet:\
 TFile.ReadWithoutGlobalRegistrationWeb:\
+%ifarch s390x
+TClingDataMemberInfo.Offset:\
+%endif
 RNTuple.TClassEBO \
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 ROOTTEST_IGNORE_PANDAS_PY3=1 \
@@ -3743,6 +3745,12 @@ fi
 %endif
 
 %changelog
+* Wed Jan 31 2024 Mattias Ellert <ellert@ellert.se> - 6.30.04-1
+- Update to 6.30.04
+- Drop patch root-adjust-test-for-failures-on-aarch64-ppc64le-s390x.patch
+  (accepted upstrem)
+- Exclude failing TClingDataMemberInfo.Offset test on s390x
+
 * Fri Jan 26 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-9
 - Rebuilt for libarrow.so.1500
 
diff --git a/sources b/sources
index 4d9b587..c59f721 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.30.02.tar.xz) = 8f4790f2cc81fd637d8e7a499232430648935856738a92b9e33b7d483e9126b6dcd238504c810818397c05aa2f34b04b6eab2dc4821e605da50ccf85db33532e
+SHA512 (root-6.30.04.tar.xz) = cb78a34755f4830b3dcc74d10302a391b05198e378257f5fa06bb19f23a0a4c50a45fa58e7e0cc3d4bf91368726a4419d624af40dd683715c4b4720a776133d3
 SHA512 (root-testfiles.tar.xz) = 945aef1a0cf5af672d4ab84b0ac00b76118e93008ff72447658ee82d9e955a1540af3ff7126e701418872f1d91b92ee96d4985840a519036c42732023a13f00f