From 8296ec0626d41c563b59a21d88738600dda8c3a0 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 30 May 2021 14:12:55 -0600
Subject: [PATCH] Handle junit versions better

---
 hdf.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hdf.spec b/hdf.spec
index 3435fd8..b7d0bf7 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -4,7 +4,7 @@
 
 Name: hdf
 Version: 4.2.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 URL: https://portal.hdfgroup.org/
@@ -116,7 +116,7 @@ ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar
 ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.25.jar
 
 # Fix test output
-junit_ver=$(sed -n '/<version>/{s/^.*>\([0-9]\.[0-9]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom)
+junit_ver=$(sed -n '/<version>/{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom)
 sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt
 
 ## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
@@ -261,6 +261,9 @@ make -j1 -C build-static check
 
 
 %changelog
+* Sun May 30 2021 Orion Poplawski <orion@nwra.com> - 4.2.15-5
+- Handle junit versions better
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild