Undo latest commit| Modify symlink of java/lib/hamcrest-core.jar
This commit is contained in:
parent
50f5ee1428
commit
aed1f4ba8b
7
hdf.spec
7
hdf.spec
@ -40,7 +40,7 @@ BuildRequires: libtirpc-devel
|
|||||||
BuildRequires: gcc-gfortran, gcc
|
BuildRequires: gcc-gfortran, gcc
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: hamcrest hamcrest-core
|
BuildRequires: hamcrest
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
BuildRequires: slf4j
|
BuildRequires: slf4j
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
@ -109,7 +109,12 @@ HDF4 java library
|
|||||||
|
|
||||||
# Replace jars with system versions
|
# Replace jars with system versions
|
||||||
find -name \*.jar -delete
|
find -name \*.jar -delete
|
||||||
|
# hamcrest-core is obsoleted in hamcrest-2.2
|
||||||
|
%if 0%{?fedora} > 34
|
||||||
|
ln -s %{_javadir}/hamcrest/hamcrest.jar java/lib/hamcrest-core.jar
|
||||||
|
%else
|
||||||
ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar
|
ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar
|
||||||
|
%endif
|
||||||
ln -s %{_javadir}/junit.jar java/lib/junit.jar
|
ln -s %{_javadir}/junit.jar java/lib/junit.jar
|
||||||
ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.25.jar
|
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/nop.jar java/lib/ext/slf4j-nop-1.7.25.jar
|
||||||
|
Loading…
Reference in New Issue
Block a user