rpms
/
hdf
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge 

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-04-25 10:39:31 +03:00
parent 1a8ed3a823
commit 4499a8990b
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hdf.spec
View File

@ -121,7 +121,6 @@ ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.5.jar
# Fix test output
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
>>>>>>> up/master
## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
# Use only if java is disabled