commit fd3c43c21e11d1ecf18c55e86199418b9e32bead
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Feb 12 16:23:50 2020 +0100
- updated to 3.3.2 (now packaged separately from hdfview)
- updated configure,install patches
- removed hdfview patch (no longer applicable here)
- added version patch (fix HDF5 version check to work with 1.10.[0-6])
hdf-java-configure.patch | 104 +++++++++++++----------------------------
hdf-java-hdfview.patch | 40 ----------------
hdf-java-install.patch | 63 ++++++-------------------
hdf-java-version.patch | 11 +++++
hdf-java.spec | 117 ++++++++++++++++-------------------------------
5 files changed, 95 insertions(+), 240 deletions(-)
---
diff --git a/hdf-java.spec b/hdf-java.spec
index a8d0770..9565f90 100644
--- a/hdf-java.spec
+++ b/hdf-java.spec
@@ -1,22 +1,23 @@
-# TODO: find fits.jar, netcdf.jar, slf4j-api, slf4j-nop source, build
separately
Summary: HDF Java Products
Summary(pl.UTF-8): Produkty HDF Java
Name: hdf-java
-Version: 2.11.0
-Release: 2
+Version: 3.3.2
+Release: 1
Group: Applications/File
License: BSD-like, changed sources must be marked
-Source0:
https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdf-java-2.11/src/%{name}-%{version}.tar.gz
-# Source0-md5: 22c071948d9d140506e0f91fa1855f27
+Source0:
https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-%{version}/src/HDFJava-%{version}-Source.tar.gz
+# Source0-md5: 5d234a4ff22a010d4f140fa60be86e34
Patch0: %{name}-configure.patch
Patch1: %{name}-install.patch
-Patch2: %{name}-hdfview.patch
+Patch2: %{name}-version.patch
URL: http://portal.hdfgroup.org/display/support/HDF-Java
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: h4h5tools-devel
BuildRequires: hdf-devel >= 4
-BuildRequires: hdf5-devel
+BuildRequires: hdf5-devel >= 1.8
+BuildRequires: jdk
+BuildRequires: rpmbuild(macros) >= 1.294
BuildRequires: szip-devel
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,7 +34,7 @@ interfejsy Javy HDF4 i HDF5.
Summary: Java HDF Interface (JHI)
Summary(pl.UTF-8): Interfejs HDF do Javy (JHI)
Group: Libraries/Java
-URL: http://www.hdfgroup.org/hdf-java-html/JNI/jhi/index.html
+URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI+Design+Notes
Requires: java-slf4j >= 1.7.5
%description -n java-hdf
@@ -46,7 +47,7 @@ Natywny interfejs Javy (JNI) do biblioteki standardowej HDF4.
Summary: Java HDF5 Interface (JHI5)
Summary(pl.UTF-8): Interfejs HDF5 do Javy (JHI5)
Group: Libraries/Java
-URL: http://www.hdfgroup.org/hdf-java-html/JNI/jhi5/index.html
+URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI5+Design+Notes
Requires: java-slf4j >= 1.7.5
%description -n java-hdf5
@@ -55,49 +56,6 @@ The Java Native Interface to the standard HDF5 library.
%description -n java-hdf5 -l pl.UTF-8
Natywny interfejs Javy (JNI) do biblioteki standardowej HDF5.
-%package -n java-hdf-object
-Summary: Java HDF Object Package
-Summary(pl.UTF-8): Pakiet Javy HDF Object
-Group: Libraries/Java
-URL: http://www.hdfgroup.org/hdf-java-html/hdf-object/index.html
-Requires: java-hdf = %{version}-%{release}
-Requires: java-hdf5 = %{version}-%{release}
-
-%description -n java-hdf-object
-Java package that implements HDF4 and HDF5 data objects in an
-object-oriented form.
-
-%description -n java-hdf-object -l pl.UTF-8
-Pakiet Javy z implementacją obiektów danych HDF w postaci
-zorientowanej obiektowo.
-
-%package -n hdfview
-Summary: HDFView - visual tool for browsing and editing HDF4 and HDF5
files
-Summary(pl.UTF-8): HDFView - graficzne narzędzie do przeglądania i edycji
plików HDF4 i HDF5
-Group: Applications/File
-URL: http://www.hdfgroup.org/hdf-java-html/hdfview/index.html
-Requires: java-hdf-object = %{version}-%{release}
-
-%description -n hdfview
-HDFView is a visual tool for browsing and editing HDF4 and HDF5 files.
-Using HDFView, you can:
- - view a file hierarchy in a tree structure
- - create new file, add or delete groups and datasets
- - view and modify the content of a dataset
- - add, delete and modify attributes
- - replace I/O and GUI components such as table view, image view and
- metadata view
-
-%description -n hdfview -l pl.UTF-8
-HDFView to graficzne narzędzie do przeglądania i edycji plików HDF4 i
-HDF5. Przy jego użyciu można:
- - oglądać hierarchię pliku w strukturze drzewiastej
- - utworzyć nowy plik, dodawać i usuwać grupy i zbiory danych
- - oglądać i modyfikować zawartość zbioru danych
- - dodawać, usuwać i modyfikować atrybuty
- - podmieniać komponenty we/wy i GUI, takie jak widok tabeli, widok
- obrazu czy widok metadanych.
-
%package javadoc
Summary: Javadoc documentation for hdf-java classes
Summary(pl.UTF-8): Dokumentacja javadoc dla klas hdf-java
@@ -110,7 +68,7 @@ Javadoc documentation for hdf-java classes.
Dokumentacja javadoc dla klas hdf-java.
%prep
-%setup -q
+%setup -q -n hdfjava-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -118,8 +76,8 @@ Dokumentacja javadoc dla klas hdf-java.
%build
cp -f /usr/share/automake/config.* config
%{__autoconf}
+CPPFLAGS="%{rpmcppflags} -DH5_USE_18_API"
%configure \
- --with-h4toh5 \
--with-hdf4=%{_includedir}/hdf,%{_libdir} \
--with-hdf5=%{_includedir},%{_libdir} \
--with-jdk=%{_jvmdir}/java/include,%{_jvmdir}/java/jre/lib \
@@ -129,6 +87,31 @@ cp -f /usr/share/automake/config.* config
%{__make}
+install -d javadoc/{hdflib,hdf5lib}
+TOPDIR=$(pwd)
+cd hdf/hdflib
+%javadoc -d "${TOPDIR}/javadoc/hdflib" \
+ -author \
+ -classpath lib/slf4j-api-1.7.5.tar \
+ -doctitle "<h1>HDF Java Wrapper</h1>" \
+ -use \
+ -version \
+ -windowtitle "HDF Java" \
+ *.java
+
+cd ../hdf5lib
+%javadoc -d "${TOPDIR}/javadoc/hdf5lib" \
+ -author \
+ -classpath lib/slf4j-api-1.7.5.tar \
+ -doctitle "<h1>HDF5 Java Wrapper</h1>" \
+ -use \
+ -version \
+ -windowtitle "HDF5 Java" \
+ callbacks/*.java \
+ exceptions/*.java \
+ structs/*.java \
+ *.java
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -138,13 +121,8 @@ rm -rf $RPM_BUILD_ROOT
JARDIR=$RPM_BUILD_ROOT%{_javadir} \
DOCDIR=$RPM_BUILD_ROOT%{_docdir}
-# in java-junit
-%{__rm} $RPM_BUILD_ROOT%{_javadir}/junit.jar
-# in java-slf4j
-%{__rm} $RPM_BUILD_ROOT%{_javadir}/slf4j-*.jar
-
install -d $RPM_BUILD_ROOT%{_javadocdir}
-cp -pr docs/javadocs $RPM_BUILD_ROOT%{_javadocdir}/hdf-java
+cp -pr javadoc/{hdflib,hdf5lib} $RPM_BUILD_ROOT%{_javadocdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -161,22 +139,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libjhdf5.so
%{_javadir}/jhdf5.jar
-%files -n java-hdf-object
-%defattr(644,root,root,755)
-%{_javadir}/fitsobj.jar
-%{_javadir}/jhdfobj.jar
-%{_javadir}/jhdf4obj.jar
-%{_javadir}/jhdf5obj.jar
-%{_javadir}/nc2obj.jar
-# NOTE: external jars
-%{_javadir}/fits.jar
-%{_javadir}/netcdf.jar
-
-%files -n hdfview
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/hdfview.sh
-%{_javadir}/jhdfview.jar
-
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/hdf-java
+%{_javadocdir}/hdflib
+%{_javadocdir}/hdf5lib
diff --git a/hdf-java-configure.patch b/hdf-java-configure.patch
index 7c8decf..190b3de 100644
--- a/hdf-java-configure.patch
+++ b/hdf-java-configure.patch
@@ -1,7 +1,7 @@
---- hdf-java/configure.in.orig 2012-11-13 00:12:03.000000000 +0100
-+++ hdf-java/configure.in 2013-04-06 07:35:24.816310231 +0200
-@@ -112,21 +112,21 @@
- LLEXT="a";
+--- hdfjava-3.3.2/configure.in.orig 2017-07-25 17:55:29.000000000 +0200
++++ hdfjava-3.3.2/configure.in 2020-01-29 17:15:02.134153565 +0100
+@@ -114,21 +114,21 @@
+ LLEXT="a";
JSLEXT="so";
;;
-x86_64-pc-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
@@ -10,7 +10,7 @@
SLEXT="so";
LLEXT="a"; dnl the extension for the HDF and other libraries to link to
JSLEXT="so";
- COPT="-shared -Dx86_64 -fPIC" ;
+ COPT="-shared -Dx86_64 -fPIC" ;
;;
-ia64-pc-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
+ia64-*-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
@@ -18,14 +18,14 @@
SLEXT="so";
LLEXT="a"; dnl the extension for the HDF and other libraries to link to
JSLEXT="so";
- COPT="-shared -Dia64 -fPIC" ;
+ COPT="-shared -Dia64 -fPIC" ;
;;
-*-pc-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
+*-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
TARGETLIB="linux"
SLEXT="so";
LLEXT="a"; dnl the extension for the HDF and other libraries to link to
-@@ -167,8 +167,8 @@
+@@ -169,8 +169,8 @@
case "$withval" in
yes)
@@ -36,7 +36,7 @@
;;
no)
ZLIB=""
-@@ -202,7 +202,8 @@
+@@ -204,7 +204,8 @@
case "$withval" in
yes)
@@ -46,7 +46,7 @@
;;
no)
JPEGLIB=""
-@@ -236,8 +237,8 @@
+@@ -238,8 +239,8 @@
case "$withval" in
yes)
@@ -57,7 +57,7 @@
;;
no)
SZLIB=""
-@@ -277,8 +278,8 @@
+@@ -279,8 +280,8 @@
case "$withval" in
yes)
dnl AC_MSG_ERROR(HDF4 library needed for compilation.)
@@ -68,7 +68,7 @@
;;
no)
HDF4LIB=""
-@@ -292,7 +293,7 @@
+@@ -294,7 +295,7 @@
fi
hdf4_lib="`echo $withval |cut -f2 -d, -s`"
if test -n "$hdf4_lib"; then
@@ -77,7 +77,7 @@
fi
HAVE_HDF4="yes"
else
-@@ -302,7 +303,7 @@
+@@ -304,7 +305,7 @@
;;
esac
if test -n "$HDF4LIB"; then
@@ -86,7 +86,7 @@
HAVE_HDF4="yes"
fi
AC_MSG_RESULT([$HAVE_HDF4])
-@@ -353,8 +354,8 @@
+@@ -355,8 +356,8 @@
case "$withval" in
yes)
@@ -97,7 +97,7 @@
;;
no)
HDF5LIB=""
-@@ -362,15 +363,13 @@
+@@ -364,15 +365,13 @@
;;
*)
if test -n "$withval" ; then
@@ -114,7 +114,7 @@
fi
HAVE_HDF5="yes"
else
-@@ -380,7 +379,7 @@
+@@ -382,7 +381,7 @@
;;
esac
if test -n "$HDF5LIB"; then
@@ -123,7 +123,7 @@
HAVE_HDF5="yes"
fi
AC_MSG_RESULT([$HAVE_HDF5])
-@@ -395,8 +394,14 @@
+@@ -397,8 +396,14 @@
dnl
if test -n "$HDF5LIB"; then
AC_MSG_CHECKING([dependencies for HDF5 library])
@@ -138,59 +138,7 @@
if test -n "$DFL";
then
if test "$HAVE_ZLIB" != "yes"; then
-@@ -428,7 +433,8 @@
- AC_ARG_WITH(h4toh5,[ --with-h4toh5=INC,LIB Path to the HDF 4 to 5
library (optional feature, if selected then path required is not in default
path)],,)
- case "$withval" in
- yes)
-- USEH45="no"
-+ USEH45="yes"
-+ H45LIB="-lh4toh5"
- ;;
- no)
- H45LIB=""
-@@ -451,14 +457,11 @@
- hdf45_lib="`echo $withval | cut -f2 -d, -s`"
-
- if test -n "$hdf45_lib"; then
-- HDF45LIB="$hdf45_lib"
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$hdf45_lib"
-+ fi
- AC_CHECK_LIB(h4toh5, H4toh5open,, LDFLAGS="$saved_LDFLAGS"
- AC_MSG_ERROR(cannot find HDF45 library.))
-- else
-- AC_MSG_ERROR(cannot find HDF45 library path.)
-- fi
- USEH45="yes"
- fi
- ;;
-@@ -466,12 +469,11 @@
-
- AC_MSG_RESULT([$USEH45])
- if test -n "$H45LIB"; then
-- AC_MSG_RESULT([h4toh5 library found at: $HDF45LIB])
-+ AC_MSG_RESULT([h4toh5 library found at: $H45LIB])
- fi
--H45LIB=$HDF45LIB
- H45INC=$HDF45INC
-
--ac_cv_lib_HDF45=$HDF45LIB
-+ac_cv_lib_HDF45=$H45LIB
- ac_cv_lib_HDF45INC=$HDF45INC
-
- dnl find java stuff: use -with-jdk
-@@ -637,10 +639,6 @@
- if test \( ! -d "$JH45INST" \); then
- JH45INST_FOUND=0
- fi
-- if test \( ! -w "$JH45INST" \); then
-- AC_MSG_ERROR( [ $JH45INST : not writable ])
-- JH45INST_FOUND=0
-- fi
- fi
- until test $JH45INST_FOUND -eq 1; do
- echo "Please type the directory in which to install the JH45"
-@@ -711,7 +709,7 @@
+@@ -613,7 +618,7 @@
JSLEXT="so";
JAVAINC2=$JAVAINC/irix; JAVATARG=irix-$OS;
;;
@@ -199,7 +147,7 @@
SLEXT="so";
LLEXT="a"; # the extension for the HDF and other libraries to link to
JSLEXT="so";
-@@ -719,7 +717,7 @@
+@@ -621,7 +626,7 @@
JAVAINC2=$JAVAINC/linux;
JAVATARG=linux;
;;
@@ -208,12 +156,12 @@
SLEXT="so";
LLEXT="a"; # the extension for the HDF and other libraries to link to
JSLEXT="so";
-@@ -727,7 +725,7 @@
+@@ -629,7 +634,7 @@
JAVAINC2=$JAVAINC/linux;
JAVATARG=linux;
;;
--*-pc-linux*) LD=$CC; LDOPT=-shared;
-+*-linux*) LD=$CC; LDOPT=-shared;
+-*-pc-linux*) LD=$CC; LDOPT=-shared;
++*-linux*) LD=$CC; LDOPT=-shared;
SLEXT="so";
LLEXT="a"; # the extension for the HDF and other libraries to link to
JSLEXT="so";
@@ -239,3 +187,13 @@
# Macro def: object filename used
OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o
h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o
h5tImp.o nativeData.o h5util.o h5zImp.o
+--- hdfjava-3.3.2/native/hdf5lib/Makefile.in.orig 2020-02-02
18:31:06.573816725 +0100
++++ hdfjava-3.3.2/native/hdf5lib/Makefile.in 2020-02-03 17:32:43.558058582
+0100
+@@ -32,6 +32,7 @@
+ JSLEXT=@JSLEXT@
+
+ COPT=@COPT@
++CPPFLAGS=@CPPFLAGS@
+
+ CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1)
-I$(JAVAINC2)
+
diff --git a/hdf-java-hdfview.patch b/hdf-java-hdfview.patch
deleted file mode 100644
index bc1eea3..0000000
--- a/hdf-java-hdfview.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- hdf-java-2.11.0/bin/hdfview.sh.in.orig 2014-09-03 15:42:10.000000000
+0200
-+++ hdf-java-2.11.0/bin/hdfview.sh.in 2015-01-30 16:52:07.607051794 +0100
-@@ -4,7 +4,7 @@
-
- # Adjust the following two variables to match your environment
- # where the HDFView is installed, e.g. /home/user1/hdfview
--HDFJAVA=@JH45INST@
-+HDFJAVA="/usr/share/java"
- export HDFJAVA
-
- # where Java is installed (requires jdk1.4.x or above), e.g. /usr/jdk1.4.2/bin
-@@ -15,10 +15,10 @@
- # DO NOT MODIFY BELOW THIS LINE
-
###############################################################################
-
--CPATH=$HDFJAVA"/lib/jhdf.jar:"$HDFJAVA"/lib/jhdf5.jar:"$HDFJAVA"/lib/jhdfobj.jar"
--CPATH=$CPATH":"$HDFJAVA"/lib/netcdf.jar:"$HDFJAVA"/lib/fits.jar:"$HDFJAVA"/lib/h5srb.jar"
--CPATH=$CPATH":"$HDFJAVA"/lib/jhdf4obj.jar:"$HDFJAVA"/lib/jhdf5obj.jar:"$HDFJAVA"/lib/jhdfview.jar"
--CPATH=$CPATH":"$HDFJAVA"/lib/jgraph.jar:"$HDFJAVA"/lib/ext/*"
-+CPATH="$HDFJAVA/jhdf.jar:$HDFJAVA/jhdf5.jar:$HDFJAVA/jhdfobj.jar"
-+CPATH="$CPATH:$HDFJAVA/netcdf.jar:$HDFJAVA/fits.jar"
-+CPATH="$CPATH:$HDFJAVA/jhdf4obj.jar:$HDFJAVA/jhdf5obj.jar:$HDFJAVA/jhdfview.jar"
-+CPATH="$CPATH:$HDFJAVA/fitsobj.jar:$HDFJAVA/nc2obj.jar"
-
- TEST=/usr/bin/test
- if [ ! -x /usr/bin/test ]
-@@ -61,7 +61,6 @@
- LD_LIBRARY_PATH=$HDFJAVA/lib/solaris:$HDFJAVA/lib/ext:$LD_LIBRARY_PATH
- ;;
- Linux)
--
LD_LIBRARY_PATH=$HDFJAVA"/lib/linux:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH
- ;;
- IRIX*)
- OSREV=`/bin/uname -r`
-@@ -90,4 +89,4 @@
-
- export LD_LIBRARY_PATH
-
--$JAVABIN/java @JAVAX@ -Djava.library.path=$LD_LIBRARY_PATH
ncsa.hdf.view.HDFView -root $HDFJAVA $*
-+$JAVABIN/java @JAVAX@ ncsa.hdf.view.HDFView -root $HDFJAVA $*
diff --git a/hdf-java-install.patch b/hdf-java-install.patch
index fbdb5e9..e45d616 100644
--- a/hdf-java-install.patch
+++ b/hdf-java-install.patch
@@ -1,5 +1,5 @@
---- hdf-java-2.11.0/Makefile.in.orig 2014-02-20 23:01:32.000000000 +0100
-+++ hdf-java-2.11.0/Makefile.in 2015-01-30 16:18:41.133802666 +0100
+--- hdfjava-3.3.2/Makefile.in.orig 2017-07-25 17:55:31.000000000 +0200
++++ hdfjava-3.3.2/Makefile.in 2020-01-29 17:30:05.635925542 +0100
@@ -34,6 +34,7 @@
#make this relative to the source root...
LIBDIR=$(JH45INSTALLDIR)/lib
@@ -8,7 +8,7 @@
DOCDIR= $(JH45INSTALLDIR)/docs
CLASS_DIR=$(TOP)/lib
-@@ -282,15 +283,12 @@
+@@ -206,15 +207,12 @@
install-lib: natives
-mkdir -p $(LIBDIR);
@@ -27,7 +27,7 @@
@echo "Install Natives complete"
install-hdflib:
-@@ -298,8 +296,7 @@
+@@ -222,8 +220,7 @@
do-install-hdflib: hdflib
-mkdir -p $(LIBDIR);
@@ -37,7 +37,7 @@
@echo "Install Native HDF complete"
install-hdf5lib: hdf5lib
-@@ -307,8 +304,7 @@
+@@ -231,8 +228,7 @@
do-install-hdf5lib: hdf5lib
-mkdir -p $(LIBDIR);
@@ -47,7 +47,7 @@
echo "Install Native HDF5 complete"
uninstall-lib:
-@@ -321,47 +317,46 @@
+@@ -245,23 +241,23 @@
@if test x'$(H4INC)' != x'' ; then $(MAKE) do-install-jhdf ; fi
do-install-jhdf: jhdf-packages
@@ -67,50 +67,13 @@
+ $(JAR) cf $(JARDIR)/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
@echo "Install JHI5 complete"
- install-jhdfobj: ncsa.hdf.object
-- -mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfobj.jar -C $(CLASS_DIR)
$(HDFOBJCLASSES)
-+ -mkdir -p $(JARDIR);
-+ $(JAR) cf $(JARDIR)/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES)
- @if test x'$(H4INC)' != x'' ; then $(MAKE) do-install-jhdf4obj ; fi
- @if test x'$(H5INC)' != x'' ; then $(MAKE) do-install-jhdf5obj ; fi
- @echo "Install HDFOBJ complete"
+ uninstall-jhi5:
+- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf5.jar
++ $(RM) -f $(JARDIR)/jhdf5.jar
- do-install-jhdf4obj: ncsa.hdf.object.h4
-- -mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar -C $(CLASS_DIR)
$(H4OBJCLASSES)
-+ -mkdir -p $(JARDIR);
-+ $(JAR) cf $(JARDIR)/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
- @echo "Install JHDF4 complete"
+ uninstall-jhi:
+- $(RM) -f $(JH45INSTALLDIR)/lib/jhdf.jar
++ $(RM) -f $(JARDIR)/jhdf.jar
- do-install-jhdf5obj: ncsa.hdf.object.h5
-- -mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar -C $(CLASS_DIR)
$(H5OBJCLASSES)
-+ -mkdir -p $(JARDIR);
-+ $(JAR) cf $(JARDIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
- @echo "Install JHDF4 complete"
+ install-docs: install-javadocs
- install-jhdfview: ncsa.hdf.view
-- -mkdir -p $(LIBDIR);
-- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar -C $(CLASS_DIR)
$(HDFVIEWCLASSES) $(HDFVIEWICONS)
-- -mkdir -p $(LIBDIR)/ext
-- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR)
$(NC2OBJCLASSES)
-- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR)
$(FITSOBJCLASSES)
-+ -mkdir -p $(JARDIR);
-+ $(JAR) cf $(JARDIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES)
$(HDFVIEWICONS)
-+ $(JAR) cf $(JARDIR)/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
-+ $(JAR) cf $(JARDIR)/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
- -mkdir -p $(BINDIR);
-- cp lib/netcdf.jar $(LIBDIR)
-- cp lib/fits.jar $(LIBDIR)
-- cp lib/junit.jar $(LIBDIR)
-- cp lib/slf4j-api-1.7.5.jar $(LIBDIR)
-- cp lib/ext/slf4j-nop-1.7.5.jar $(LIBDIR)
-+ cp lib/netcdf.jar $(JARDIR)
-+ cp lib/fits.jar $(JARDIR)
-+ cp lib/junit.jar $(JARDIR)
-+ cp lib/slf4j-api-1.7.5.jar $(JARDIR)
-+ cp lib/ext/slf4j-nop-1.7.5.jar $(JARDIR)
- cp bin/hdfview.sh $(BINDIR)
- chmod a+x $(BINDIR)/hdfview.sh
- @echo "Install HDFVIEW complete"
diff --git a/hdf-java-version.patch b/hdf-java-version.patch
new file mode 100644
index 0000000..9837b21
--- /dev/null
+++ b/hdf-java-version.patch
@@ -0,0 +1,11 @@
+--- hdfjava-3.3.2/native/hdf5lib/h5pImp.c.orig 2017-07-25 17:55:22.000000000
+0200
++++ hdfjava-3.3.2/native/hdf5lib/h5pImp.c 2020-02-03 20:32:09.553067521
+0100
+@@ -4128,7 +4128,7 @@
+ Java_hdf_hdf5lib_H5_H5Pget_1elink_1file_1cache_1size
+ (JNIEnv *env, jclass clss, jint plist)
+ {
+-#if (H5_VERS_RELEASE > 6) /* H5_VERSION_GE(1,8,7) */
++#if H5_VERSION_GE(1,8,7)
+ unsigned s = 0;
+
+ if (H5Pget_elink_file_cache_size((hid_t)plist, &s) < 0)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf-java.git/commitdiff/fd3c43c21e11d1ecf18c55e86199418b9e32bead
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
