From 3313aff0d37a3f7b858c67dc5210c90c7c36dfe8 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 29 Jul 2021 12:53:04 +0200 Subject: [PATCH] Fix eln builds --- hdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hdf.spec b/hdf.spec index 1705188..c21126a 100644 --- a/hdf.spec +++ b/hdf.spec @@ -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 - 4.2.15-7 +- Fix eln builds + * Wed Jul 28 2021 Antonio Trande - 4.2.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Use bundled junit