Handle junit versions better
This commit is contained in:
parent
b8d1f3a43a
commit
8296ec0626
7
hdf.spec
7
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue