Handle junit versions better

This commit is contained in:
Orion Poplawski 2021-05-30 14:14:58 -06:00
parent afea0fc5c3
commit 69df9b6ae9

View File

@ -7,7 +7,7 @@
# You need to recompile all users of HDF5 for each version change
Name: hdf5
Version: 1.10.6
Release: 5%{?dist}
Release: 6%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD
URL: https://portal.hdfgroup.org/display/HDF5/HDF5
@ -169,7 +169,7 @@ ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar
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
# Force shared by default for compiler wrappers (bug #1266645)
@ -478,6 +478,9 @@ done
%changelog
* Sun May 30 2021 Orion Poplawski <orion@nwra.com> - 1.10.6-6
- Handle junit versions better
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild