[jhdf5] Update to jhdf5 1.10.1
Clément David
davidcl at fedoraproject.org
Thu Jul 3 11:27:54 UTC 2014
commit 52463ebffef9253c80f62660c982a3eb0e4f6ddd
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Thu Jul 3 13:21:34 2014 +0200
Update to jhdf5 1.10.1
jhdf5-0001-add-a-generic-linux-host.patch | 5 -
jhdf5-0002-add-H4_-prefix-to-constants.patch | 17 +---
...0003-use-system-linker-for-shared-library.patch | 9 +--
...5-0005-update-config.sub-and-config.guess.patch | 96 ++++++++++----------
jhdf5.spec | 7 +-
sources | 2 +-
6 files changed, 57 insertions(+), 79 deletions(-)
---
diff --git a/jhdf5-0001-add-a-generic-linux-host.patch b/jhdf5-0001-add-a-generic-linux-host.patch
index 935dc46..b8f1a1e 100644
--- a/jhdf5-0001-add-a-generic-linux-host.patch
+++ b/jhdf5-0001-add-a-generic-linux-host.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 1/7] add a generic linux host
configure.in | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
-diff --git a/configure.in b/configure.in
-index 7a0e37f..203a4e2 100755
--- a/configure.in
+++ b/configure.in
@@ -88,6 +88,13 @@ AC_CANONICAL_SYSTEM
@@ -40,6 +38,3 @@ index 7a0e37f..203a4e2 100755
alpha-dec-osf*.*)
LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
LLEXT="a";
---
-1.7.7.6
-
diff --git a/jhdf5-0002-add-H4_-prefix-to-constants.patch b/jhdf5-0002-add-H4_-prefix-to-constants.patch
index 9fdabce..b9b7f40 100644
--- a/jhdf5-0002-add-H4_-prefix-to-constants.patch
+++ b/jhdf5-0002-add-H4_-prefix-to-constants.patch
@@ -9,11 +9,9 @@ Subject: [PATCH 2/7] add H4_ prefix to constants
native/hdflib/hdfvdataImp.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/native/hdflib/hdfsdsImp.c b/native/hdflib/hdfsdsImp.c
-index ff65e02..b88eb35 100755
--- a/native/hdflib/hdfsdsImp.c
+++ b/native/hdflib/hdfsdsImp.c
-@@ -149,7 +149,7 @@ jintArray argv) /* OUT: rank, NT, nattr */
+@@ -149,7 +149,7 @@ jintArray argv) /* OUT: rank, NT, nattr
int32 *dims;
int32 *theArgs;
@@ -22,7 +20,7 @@ index ff65e02..b88eb35 100755
if (cname == NULL) {
h4outOfMemory(env, "SDgetinfo");
return FAIL;
-@@ -160,7 +160,7 @@ jintArray argv) /* OUT: rank, NT, nattr */
+@@ -160,7 +160,7 @@ jintArray argv) /* OUT: rank, NT, nattr
retVal = SDgetinfo((int32)sdsid, cname, &(theArgs[0]), dims,
&(theArgs[1]), &(theArgs[2]));
@@ -31,8 +29,6 @@ index ff65e02..b88eb35 100755
if (retVal == FAIL) {
ENVPTR->ReleaseIntArrayElements(ENVPAR dimsizes,(jint *)dims,JNI_ABORT);
-diff --git a/native/hdflib/hdfstructsutil.c b/native/hdflib/hdfstructsutil.c
-index 9e22871..1d48988 100755
--- a/native/hdflib/hdfstructsutil.c
+++ b/native/hdflib/hdfstructsutil.c
@@ -411,7 +411,7 @@ jboolean bb;
@@ -67,11 +63,9 @@ index 9e22871..1d48988 100755
/* release rarray? */
-diff --git a/native/hdflib/hdfvdataImp.c b/native/hdflib/hdfvdataImp.c
-index 80b85d7..36f3a13 100755
--- a/native/hdflib/hdfvdataImp.c
+++ b/native/hdflib/hdfvdataImp.c
-@@ -357,7 +357,7 @@ jobjectArray sargs) /* OUT: String fields, vdata_name */
+@@ -361,7 +361,7 @@ jobjectArray sargs) /* OUT: String field
return FAIL;
}
@@ -80,7 +74,7 @@ index 80b85d7..36f3a13 100755
if (name == NULL) {
free(flds);
return FAIL;
-@@ -375,7 +375,7 @@ jobjectArray sargs) /* OUT: String fields, vdata_name */
+@@ -379,7 +379,7 @@ jobjectArray sargs) /* OUT: String field
(int32 *)&(theIargs[1]), flds, (int32 *)&(theIargs[2]), name);
flds[MAX_FIELD_SIZE] = '\0';
@@ -89,6 +83,3 @@ index 80b85d7..36f3a13 100755
if (rval == FAIL) {
ENVPTR->ReleaseIntArrayElements(ENVPAR iargs,theIargs,JNI_ABORT);
---
-1.7.7.6
-
diff --git a/jhdf5-0003-use-system-linker-for-shared-library.patch b/jhdf5-0003-use-system-linker-for-shared-library.patch
index 2b92af0..0d0339e 100644
--- a/jhdf5-0003-use-system-linker-for-shared-library.patch
+++ b/jhdf5-0003-use-system-linker-for-shared-library.patch
@@ -8,8 +8,6 @@ Subject: [PATCH 3/7] use system linker for shared library
native/hdf5lib/Makefile.in | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
-diff --git a/configure.in b/configure.in
-index 203a4e2..c1b4b06 100755
--- a/configure.in
+++ b/configure.in
@@ -184,7 +184,7 @@ case "$withval" in
@@ -56,7 +54,7 @@ index 203a4e2..c1b4b06 100755
HAVE_HDF5="yes"
fi
AC_MSG_RESULT([$HAVE_HDF5])
-@@ -400,7 +400,7 @@ dnl Check that the libraries that HDF4 needs have been found
+@@ -400,7 +400,7 @@ dnl Check that the libraries that HDF4
dnl
dnl Must stop here if something is missing.
dnl
@@ -65,8 +63,6 @@ index 203a4e2..c1b4b06 100755
AC_MSG_CHECKING([dependencies for HDF5 library])
DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
-diff --git a/native/hdf5lib/Makefile.in b/native/hdf5lib/Makefile.in
-index 98da3ac..a4e9f91 100644
--- a/native/hdf5lib/Makefile.in
+++ b/native/hdf5lib/Makefile.in
@@ -35,7 +35,7 @@ COPT=@COPT@
@@ -78,6 +74,3 @@ index 98da3ac..a4e9f91 100644
# 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
---
-1.7.7.6
-
diff --git a/jhdf5-0005-update-config.sub-and-config.guess.patch b/jhdf5-0005-update-config.sub-and-config.guess.patch
index 6cee68f..65fa602 100644
--- a/jhdf5-0005-update-config.sub-and-config.guess.patch
+++ b/jhdf5-0005-update-config.sub-and-config.guess.patch
@@ -8,8 +8,6 @@ Subject: [PATCH 5/7] update config.sub and config.guess
config/config.sub | 998 +++++++++++++++++++++++++++++++++-----
2 files changed, 1963 insertions(+), 387 deletions(-)
-diff --git a/config/config.guess b/config/config.guess
-index 20b8238..dc84c68 100755
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,7 +1,11 @@
@@ -408,7 +406,7 @@ index 20b8238..dc84c68 100755
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
-@@ -104,46 +366,78 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -104,46 +366,78 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -514,7 +512,7 @@ index 20b8238..dc84c68 100755
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-@@ -158,62 +452,83 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -158,62 +452,83 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
exit (-1);
}
EOF
@@ -1018,6 +1016,24 @@ index 20b8238..dc84c68 100755
- echo alpha-unknown-linux-gnu ; exit 0
- elif test "${UNAME_MACHINE}" = "sparc" ; then
- echo sparc-unknown-linux-gnu ; exit 0
+- else
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
+- # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
+- test ! -d /usr/lib/ldscripts/. \
+- && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+- # Determine whether the default compiler is a.out or elf
+- cat >dummy.c <<EOF
+-main(argc, argv)
+-int argc;
+-char *argv[];
+-{
+-#ifdef __ELF__
+- printf ("%s-pc-linux-gnu\n", argv[1]);
+-#else
+- printf ("%s-pc-linux-gnuaout\n", argv[1]);
+-#endif
+- return 0;
+-}
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
@@ -1048,24 +1064,7 @@ index 20b8238..dc84c68 100755
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
-- # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
-- test ! -d /usr/lib/ldscripts/. \
-- && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-- # Determine whether the default compiler is a.out or elf
-- cat >dummy.c <<EOF
--main(argc, argv)
--int argc;
--char *argv[];
--{
--#ifdef __ELF__
-- printf ("%s-pc-linux-gnu\n", argv[1]);
--#else
-- printf ("%s-pc-linux-gnuaout\n", argv[1]);
--#endif
-- return 0;
--}
++ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
+ exit ;;
@@ -1690,8 +1689,6 @@ index 20b8238..dc84c68 100755
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff --git a/config/config.sub b/config/config.sub
-index b87a32d..2a55a50 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,6 +1,11 @@
@@ -1838,16 +1835,16 @@ index b87a32d..2a55a50 100755
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple)
+ -apple | -axis | -knuth | -cray | -microblaze)
-+ os=
-+ basic_machine=$1
-+ ;;
+ os=
+ basic_machine=$1
+ ;;
+ -bluegene*)
+ os=-cnk
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
++ os=
++ basic_machine=$1
++ ;;
+ -scout)
+ ;;
+ -wrs)
@@ -2184,13 +2181,14 @@ index b87a32d..2a55a50 100755
- cray2)
- basic_machine=cray2-cray
- os=-unicos
-+ craynv)
-+ basic_machine=craynv-cray
-+ os=-unicosmp
- ;;
+- ;;
- [ctj]90-cray)
- basic_machine=c90-cray
- os=-unicos
++ craynv)
++ basic_machine=craynv-cray
++ os=-unicosmp
++ ;;
+ cr16)
+ basic_machine=cr16-unknown
+ os=-elf
@@ -2511,19 +2509,19 @@ index b87a32d..2a55a50 100755
- basic_machine=i586-intel
+ pc98)
+ basic_machine=i386-pc
- ;;
-- pentiumpro | p6)
-- basic_machine=i686-intel
++ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-- pentium-* | p5-*)
++ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
-+ ;;
+ ;;
+- pentiumpro | p6)
+- basic_machine=i686-intel
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ basic_machine=i686-pc
-+ ;;
+ ;;
+- pentium-* | p5-*)
+ pentiumii | pentium2 | pentiumiii | pentium3)
+ basic_machine=i686-pc
+ ;;
@@ -2535,14 +2533,15 @@ index b87a32d..2a55a50 100755
;;
- pentiumpro-* | p6-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- k5)
- # We don't have specific support for AMD's K5 yet, so just call it a Pentium
- basic_machine=i586-amd
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
+- ;;
- nexen)
- # We don't have specific support for Nexgen yet, so just call it a Pentium
- basic_machine=i586-nexgen
@@ -2750,12 +2749,12 @@ index b87a32d..2a55a50 100755
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
- ;;
-- xps | xps100)
++ ;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
-+ ;;
+ ;;
+- xps | xps100)
+ xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -3225,6 +3224,3 @@ index b87a32d..2a55a50 100755
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
---
-1.7.7.6
-
diff --git a/jhdf5.spec b/jhdf5.spec
index 6c76b25..43ce5d0 100644
--- a/jhdf5.spec
+++ b/jhdf5.spec
@@ -1,6 +1,6 @@
Name: jhdf5
-Version: 2.10
-Release: 3%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
Summary: Java HDF5 Package
Group: Development/Libraries
@@ -280,6 +280,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc docs
%changelog
+* Thu Jul 03 2014 Clément David <c.david86 at gmail.com> - 2.10.1-1
+- Update to jhdf5 1.10.1
+
* Tue Jun 10 2014 Orion Poplawski <orion at cora.nwra.com> - 2.10-3
- Rebuild for hdf 1.8.13
diff --git a/sources b/sources
index bbdfa37..ec44e8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cdad087aaa381a342e936387ef26dde hdf-java-2.10-source.tar.gz
+8b9d3c31b02ff3a98b1ea9692fde44c4 hdf-java-2.10.1-source.tar.gz
More information about the scm-commits
mailing list