Fix eln builds

This commit is contained in:
Antonio Trande 2021-07-29 12:53:04 +02:00
parent c8ec4e6abb
commit 3313aff0d3
1 changed files with 5 additions and 2 deletions

View File

@ -4,7 +4,7 @@
Name: hdf
Version: 4.2.15
Release: 6%{?dist}
Release: 7%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD
URL: https://portal.hdfgroup.org/
@ -110,7 +110,7 @@ HDF4 java library
# Replace jars with system versions
# hamcrest-core is obsoleted in hamcrest-2.2
# Junit tests are failing with junit-4.13.1
%if 0%{?fedora} > 34
%if 0%{?rhel} >= 9 || 0%{?fedora} > 34
find . ! -name junit.jar -name "*.jar" -delete
ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar
%else
@ -267,6 +267,9 @@ make -j1 -C build-static check
%changelog
* Thu Jul 29 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.2.15-7
- Fix eln builds
* Wed Jul 28 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.2.15-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
- Use bundled junit