[jhdf5] Update to 2.9
Clément David
davidcl at fedoraproject.org
Fri Jan 25 09:57:28 UTC 2013
commit 8bdf07881a1228a49e7395e6c45422ba7e2a3fd6
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Fri Jan 25 10:03:44 2013 +0100
Update to 2.9
- Upgrade to the Java packaging draft (JNI jar/so location)
.gitignore | 12 +-
0007-update-configure.patch | 8191 --------------------
hdfview | 4 +-
...ch => jhdf5-0001-add-a-generic-linux-host.patch | 0
...=> jhdf5-0002-add-H4_-prefix-to-constants.patch | 0
...0003-use-system-linker-for-shared-library.patch | 0
...> jhdf5-0004-remove-writable-prefix-check.patch | 9 +-
...5-0005-update-config.sub-and-config.guess.patch | 16 +-
jhdf5-0006-update-configure.patch | 573 ++
jhdf5.spec | 60 +-
sources | 2 +-
11 files changed, 628 insertions(+), 8239 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20e029a..9aa80d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,9 @@
/*~
/*.log
/*.src.rpm
-/hdf-java
-/noarch
-/i686
-/x86_64
-/hdf-java-2.7-src.tar
-/hdf-java-2.8-src.tar
+/hdf-java/
+/noarch/
+/i686/
+/x86_64/
+/results_jhdf5/
+/hdf-java-*-src.tar
diff --git a/hdfview b/hdfview
index 98bb7b6..9107c69 100755
--- a/hdfview
+++ b/hdfview
@@ -2,12 +2,12 @@
CLASSPATH="$CLASSPATH:/usr/share/java/jhdfview.jar"
-CLASSPATH="$CLASSPATH:/usr/share/java/jhdf.jar:/usr/share/java/jhdf5.jar"
+CLASSPATH="$CLASSPATH:/usr/lib/java/jhdf.jar:/usr/lib/java/jhdf5.jar"
CLASSPATH="$CLASSPATH:/usr/share/java/jhdfobj.jar"
CLASSPATH="$CLASSPATH:/usr/share/java/jhdf4obj.jar:/usr/share/java/jhdf5obj.jar"
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/java:/usr/lib64/java"
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jhdf:/usr/lib/jhdf5:/usr/lib64/jhdf:/usr/lib64/jhdf5"
export CLASSPATH
export LD_LIBRARY_PATH
diff --git a/0001-add-a-generic-linux-host.patch b/jhdf5-0001-add-a-generic-linux-host.patch
similarity index 100%
rename from 0001-add-a-generic-linux-host.patch
rename to jhdf5-0001-add-a-generic-linux-host.patch
diff --git a/0002-add-H4_-prefix-to-constants.patch b/jhdf5-0002-add-H4_-prefix-to-constants.patch
similarity index 100%
rename from 0002-add-H4_-prefix-to-constants.patch
rename to jhdf5-0002-add-H4_-prefix-to-constants.patch
diff --git a/0003-use-system-linker-for-shared-library.patch b/jhdf5-0003-use-system-linker-for-shared-library.patch
similarity index 100%
rename from 0003-use-system-linker-for-shared-library.patch
rename to jhdf5-0003-use-system-linker-for-shared-library.patch
diff --git a/0004-remove-writable-prefix-check.patch b/jhdf5-0004-remove-writable-prefix-check.patch
similarity index 83%
rename from 0004-remove-writable-prefix-check.patch
rename to jhdf5-0004-remove-writable-prefix-check.patch
index f876f5f..241b08e 100644
--- a/0004-remove-writable-prefix-check.patch
+++ b/jhdf5-0004-remove-writable-prefix-check.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 4/7] remove writable prefix check
configure.in | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
-diff --git a/configure.in b/configure.in
-index c1b4b06..c4a2fcb 100755
--- a/configure.in
+++ b/configure.in
@@ -644,10 +644,6 @@ if test $JH45INST_FOUND -eq 1; then
@@ -16,7 +14,7 @@ index c1b4b06..c4a2fcb 100755
JH45INST_FOUND=0
fi
- if test \( ! -w "$JH45INST" \); then
-- AC_MSG_ERROR( [ $JAVINST : not writable ])
+- AC_MSG_ERROR( [ $JH45INST : not writable ])
- JH45INST_FOUND=0
- fi
fi
@@ -27,12 +25,9 @@ index c1b4b06..c4a2fcb 100755
JH45INST_FOUND=0
fi
- if test \( ! -w "$JH45INST" \); then
-- AC_MSG_ERROR( [ $JAVINST : not writable ])
+- AC_MSG_ERROR( [ $JH45INST : not writable ])
- JH45INST_FOUND=0
- fi
done
ac_cv_lib_JH45INST=$JH45INST
---
-1.7.7.6
-
diff --git a/0005-update-config.sub-and-config.guess.patch b/jhdf5-0005-update-config.sub-and-config.guess.patch
similarity index 99%
rename from 0005-update-config.sub-and-config.guess.patch
rename to jhdf5-0005-update-config.sub-and-config.guess.patch
index 06b0d95..6cee68f 100644
--- a/0005-update-config.sub-and-config.guess.patch
+++ b/jhdf5-0005-update-config.sub-and-config.guess.patch
@@ -4,14 +4,14 @@ Date: Wed, 25 Jan 2012 18:51:14 +0100
Subject: [PATCH 5/7] update config.sub and config.guess
---
- Config/config.guess | 1352 ++++++++++++++++++++++++++++++++++++++++-----------
- Config/config.sub | 998 +++++++++++++++++++++++++++++++++-----
+ config/config.guess | 1352 ++++++++++++++++++++++++++++++++++++++++-----------
+ config/config.sub | 998 +++++++++++++++++++++++++++++++++-----
2 files changed, 1963 insertions(+), 387 deletions(-)
-diff --git a/Config/config.guess b/Config/config.guess
+diff --git a/config/config.guess b/config/config.guess
index 20b8238..dc84c68 100755
---- a/Config/config.guess
-+++ b/Config/config.guess
+--- a/config/config.guess
++++ b/config/config.guess
@@ -1,7 +1,11 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -1690,10 +1690,10 @@ index 20b8238..dc84c68 100755
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff --git a/Config/config.sub b/Config/config.sub
+diff --git a/config/config.sub b/config/config.sub
index b87a32d..2a55a50 100755
---- a/Config/config.sub
-+++ b/Config/config.sub
+--- a/config/config.sub
++++ b/config/config.sub
@@ -1,6 +1,11 @@
#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
diff --git a/jhdf5-0006-update-configure.patch b/jhdf5-0006-update-configure.patch
new file mode 100644
index 0000000..d9cad9c
--- /dev/null
+++ b/jhdf5-0006-update-configure.patch
@@ -0,0 +1,573 @@
+From 24d3e8a66f895c52eb8ed934a21bb0d21c22de72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Wed, 25 Jan 2012 18:51:39 +0100
+Subject: [PATCH 7/7] update configure
+
+---
+ configure | 6282 +++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 3363 insertions(+), 2919 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -1,11 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68.
++# Generated by GNU Autoconf 2.69.
+ #
+ #
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -134,6 +132,31 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
++# Use a proper internal environment variable to ensure we don't fall
++ # into an infinite loop, continuously re-executing ourselves.
++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++ _as_can_reexec=no; export _as_can_reexec;
++ # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++ fi
++ # We don't want this to propagate to other subprocesses.
++ { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test
+ else
+ exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -212,21 +236,25 @@ IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+- # We cannot yet assume a decent shell, so we have to provide a
+- # neutralization value for shells without unset; and this also
+- # works around shells that cannot unset nonexistent variables.
+- # Preserve -v and -x to the replacement shell.
+- BASH_ENV=/dev/null
+- ENV=/dev/null
+- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+- export CONFIG_SHELL
+- case $- in # ((((
+- *v*x* | *x*v* ) as_opts=-vx ;;
+- *v* ) as_opts=-v ;;
+- *x* ) as_opts=-x ;;
+- * ) as_opts= ;;
+- esac
+- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++ export CONFIG_SHELL
++ # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
+ fi
+
+ if test x$as_have_required = xno; then :
+@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
+
+
+ } # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++ # already done that, so ensure we don't try to do so again and fall
++ # in an infinite loop. This has already happened in practice.
++ _as_can_reexec=no; export _as_can_reexec
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
++ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -504,28 +544,8 @@ else
+ as_mkdir_p=false
+ fi
+
+-if test -x / >/dev/null 2>&1; then
+- as_test_x='test -x'
+-else
+- if ls -dL / >/dev/null 2>&1; then
+- as_ls_L_option=L
+- else
+- as_ls_L_option=
+- fi
+- as_test_x='
+- eval sh -c '\''
+- if test -d "$1"; then
+- test -d "$1/.";
+- else
+- case $1 in #(
+- -*)set "./$1";;
+- esac;
+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+- ???[sx]*):;;*)false;;esac;fi
+- '\'' sh
+- '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -1185,8 +1205,6 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used" >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -1433,9 +1451,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.69
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1590,7 +1608,7 @@ $as_echo "$ac_try_echo"; } >&5
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
++ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+ else
+@@ -1731,7 +1749,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.68. Invocation command line was
++generated by GNU Autoconf 2.69. Invocation command line was
+
+ $ $0 $@
+
+@@ -2136,7 +2154,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2209,7 +2227,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2249,7 +2267,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2302,7 +2320,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2343,7 +2361,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -2401,7 +2419,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2445,7 +2463,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2891,8 +2909,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ /* end confdefs.h. */
+ #include <stdarg.h>
+ #include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
++struct stat;
+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+ struct buf { int x; };
+ FILE * (*rcsopen) (struct buf *, struct stat *, int);
+@@ -3046,7 +3063,7 @@ case $as_dir/ in #((
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -3258,7 +3275,7 @@ do
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++ as_fn_executable_p "$ac_path_GREP" || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -3324,7 +3341,7 @@ do
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++ as_fn_executable_p "$ac_path_EGREP" || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -3598,7 +3615,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -3639,7 +3656,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -3777,6 +3794,12 @@ test -n "$target_alias" &&
+ TARGET=$target
+ echo "FYI the target here is: "$target
+ case $target in
++*linux*) LD=$CC; LDOPT="-shared $LDFLAGS"; SLEXT="so";
++TARGETLIB="linux"
++SLEXT="so";
++LLEXT="a"; JSLEXT="so";
++COPT="-shared -fpic $CFLAGS" ;
++;;
+ alpha-dec-osf*.*) TARGETLIB="alpha"
+ LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
+ LLEXT="a";
+@@ -3861,7 +3884,7 @@ case "$withval" in
+ *)
+ if test -n "$withval" ; then
+ z_lib="`echo $withval |cut -f2 -d, -s`"
+- ZLIB=$z_lib"/libz."$LLEXT
++ ZLIB="-lz"
+ HAVE_ZLIB="yes"
+ else
+ ZLIB=""
+@@ -3903,7 +3926,7 @@ case "$withval" in
+ *)
+ if test -n "$withval" ; then
+ jpeg_lib="`echo $withval |cut -f2 -d, -s`"
+- JPEGLIB=$jpeg_lib"/libjpeg."$LLEXT
++ JPEGLIB="-ljpeg"
+ HAVE_JPEG="yes"
+ else
+ HAVE_JPEG="no"
+@@ -4069,14 +4092,14 @@ case "$withval" in
+ *)
+ if test -n "$withval" ; then
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
++ HDF5LIB="-lhdf5"
+ hdf5_inc="`echo $withval |cut -f1 -d,`"
+ if test -n "$hdf5_inc"; then
+ HDF5INC="$hdf5_inc"
+ fi
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+ if test -n "$hdf5_lib"; then
+- HDF5LIB=$hdf5_lib
++ HDF5LIB="-lhdf5"
+ fi
+ HAVE_HDF5="yes"
+ else
+@@ -4086,7 +4109,7 @@ case "$withval" in
+ ;;
+ esac
+ if test -n "$HDF5LIB"; then
+- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
++ LIBS="-lhdf5"
+ HAVE_HDF5="yes"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_HDF5" >&5
+@@ -4096,7 +4119,7 @@ if test $HAVE_HDF5 = "yes"; then
+ $as_echo "HDF5 found: $HDF5LIB" >&6; };
+ fi
+
+-if test -n "$HDF5LIB"; then
++if test -n "$HDF5LIB" -a -d "$HDF5LIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependencies for HDF5 library" >&5
+ $as_echo_n "checking dependencies for HDF5 library... " >&6; }
+ DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
+@@ -4404,7 +4427,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -4444,7 +4467,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -4484,7 +4507,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -4524,7 +4547,7 @@ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -4623,10 +4646,6 @@ if test $JH45INST_FOUND -eq 1; then
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- as_fn_error $? " $JH45INST : not writable " "$LINENO" 5
+- JH45INST_FOUND=0
+- fi
+ fi
+ until test $JH45INST_FOUND -eq 1; do
+ echo "Please type the directory in which to install the JH45"
+@@ -4635,10 +4654,6 @@ until test $JH45INST_FOUND -eq 1; do
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- as_fn_error $? " $JH45INST : not writable " "$LINENO" 5
+- JH45INST_FOUND=0
+- fi
+ done
+
+ ac_cv_lib_JH45INST=$JH45INST
+@@ -4646,6 +4661,14 @@ JHVINST=$JH45INST
+ JH5INST=$JH45INST
+
+ case $target in
++*linux*) LD=$CC; LDOPT="-shared $LDFLAGS";
++SLEXT="so";
++LLEXT="a"; # the extension for the HDF and other libraries to link to
++JSLEXT="so";
++COPT="-shared -fpic $CFLAGS" ;
++JAVAINC2=$JAVAINC/linux;
++JAVATARG=linux;
++;;
+ alpha-dec-osf*.*)
+ LD=$CC; LDOPT="-pthread -shared"; SLEXT="so";
+ LLEXT="a";
+@@ -5258,16 +5281,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
++ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+ else
+- as_ln_s='cp -p'
++ as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -5327,28 +5350,16 @@ else
+ as_mkdir_p=false
+ fi
+
+-if test -x / >/dev/null 2>&1; then
+- as_test_x='test -x'
+-else
+- if ls -dL / >/dev/null 2>&1; then
+- as_ls_L_option=L
+- else
+- as_ls_L_option=
+- fi
+- as_test_x='
+- eval sh -c '\''
+- if test -d "$1"; then
+- test -d "$1/.";
+- else
+- case $1 in #(
+- -*)set "./$1";;
+- esac;
+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+- ???[sx]*):;;*)false;;esac;fi
+- '\'' sh
+- '
+-fi
+-as_executable_p=$as_test_x
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++ test -f "$1" && test -x "$1"
++} # as_fn_executable_p
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -5370,7 +5381,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.68. Invocation command line was
++generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -5423,10 +5434,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.68,
++configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2012 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -5505,7 +5516,7 @@ fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
diff --git a/jhdf5.spec b/jhdf5.spec
index fda58be..07970bb 100644
--- a/jhdf5.spec
+++ b/jhdf5.spec
@@ -1,6 +1,6 @@
Name: jhdf5
-Version: 2.8
-Release: 10%{?dist}
+Version: 2.9
+Release: 1%{?dist}
Summary: Java HDF5 Package
Group: Development/Libraries
@@ -11,18 +11,20 @@ Source1: hdfview
Source2: hdfview.xml
Source3: hdfview.desktop
-Patch1: 0001-add-a-generic-linux-host.patch
-Patch2: 0002-add-H4_-prefix-to-constants.patch
-Patch3: 0003-use-system-linker-for-shared-library.patch
-Patch4: 0004-remove-writable-prefix-check.patch
-Patch5: 0005-update-config.sub-and-config.guess.patch
-Patch7: 0007-update-configure.patch
+Patch1: jhdf5-0001-add-a-generic-linux-host.patch
+Patch2: jhdf5-0002-add-H4_-prefix-to-constants.patch
+Patch3: jhdf5-0003-use-system-linker-for-shared-library.patch
+Patch4: jhdf5-0004-remove-writable-prefix-check.patch
+Patch5: jhdf5-0005-update-config.sub-and-config.guess.patch
+Patch6: jhdf5-0006-update-configure.patch
BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: hdf5-devel
BuildRequires: libjpeg-devel
+BuildRequires: junit
+
Requires: jpackage-utils
Requires: java
# hdf5 does not bump soname but check at runtime
@@ -126,11 +128,14 @@ This package provides a HDF4/HDF5 viewer.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch7 -p1
+%patch6 -p1
# remove shipped jars
rm $(find -name \*.jar)
+# build jar repo
+build-jar-repository -p lib junit
+
# fix spurious-executable-perm
chmod -x $(find docs -type f)
chmod -x $(find native -type f)
@@ -158,23 +163,26 @@ popd
make natives jhdf-packages jhdf5-packages \
jhdfobj-packages jhdfview-packages
+%check
+make tests
+
%install
# jhdf5 jars
-install -dm 755 %{buildroot}%{_javadir}
-install -pm 0644 lib/jhdf5.jar %{buildroot}%{_javadir}/jhdf5.jar
+install -dm 755 %{buildroot}%{_jnidir}
+install -pm 0644 lib/jhdf5.jar %{buildroot}%{_jnidir}/jhdf5.jar
# jhdf5 lib
-install -dm 755 %{buildroot}%{_jnidir}
-install -m 744 lib/linux/libjhdf5.so %{buildroot}%{_jnidir}
+install -dm 755 %{buildroot}%{_libdir}/jhdf5
+install -m 744 lib/linux/libjhdf5.so %{buildroot}%{_libdir}/jhdf5
# jhdf jars
-install -dm 755 %{buildroot}%{_javadir}
-install -pm 0644 lib/jhdf.jar %{buildroot}%{_javadir}/jhdf.jar
+install -dm 755 %{buildroot}%{_jnidir}
+install -pm 0644 lib/jhdf.jar %{buildroot}%{_jnidir}/jhdf.jar
# jhdf lib
-install -dm 755 %{buildroot}%{_jnidir}
-install -m 744 lib/linux/libjhdf.so %{buildroot}%{_jnidir}
+install -dm 755 %{buildroot}%{_libdir}/jhdf
+install -m 744 lib/linux/libjhdf.so %{buildroot}%{_libdir}/jhdf
# jhdfobj jars
install -dm 755 %{buildroot}%{_javadir}
@@ -239,13 +247,13 @@ fi
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%{_javadir}/jhdf5.jar
-%attr(755,root,root) %{_jnidir}/libjhdf5.so
+%{_jnidir}/jhdf5.jar
+%attr(755,root,root) %{_libdir}/jhdf5/libjhdf5.so
%doc COPYING Readme.txt
%files -n jhdf
-%{_javadir}/jhdf.jar
-%attr(755,root,root) %{_jnidir}/libjhdf.so
+%{_jnidir}/jhdf.jar
+%attr(755,root,root) %{_libdir}/jhdf/libjhdf.so
%doc COPYING Readme.txt
%files -n jhdfobj
@@ -264,6 +272,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc docs
%changelog
+* Thu Jan 24 2013 Clément David <c.david86 at gmail.com> - 2.9-1
+- Update to 2.9
+- Upgrade to the Java packaging draft (JNI jar/so location)
+
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.8-10
- rebuild due to "jpeg8-ABI" feature drop
@@ -283,13 +295,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Mon Feb 13 2012 Clément David <davidcl at fedoraproject.org> - 2.8-5
- bump version to depends on latest hdf5
-* Wed Jan 31 2012 Clément David <davidcl at fedoraproject.org> - 2.8-4
+* Tue Jan 31 2012 Clément David <davidcl at fedoraproject.org> - 2.8-4
- fix hdfview CLASSPATH
-* Wed Jan 30 2012 Clément David <davidcl at fedoraproject.org> - 2.8-3
+* Mon Jan 30 2012 Clément David <davidcl at fedoraproject.org> - 2.8-3
- split jhdfobj as an object oriented API of jhdf and jhdf5.
-* Wed Jan 27 2012 Clément David <davidcl at fedoraproject.org> - 2.8-2
+* Fri Jan 27 2012 Clément David <davidcl at fedoraproject.org> - 2.8-2
- use %%{_hdf5_version} for hdfview
- use same jhdf and jhdf5 versions for hdfview
diff --git a/sources b/sources
index a14f922..b22626b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ade28a25622cdbf32e154dd610821d2 hdf-java-2.8-src.tar
+f8d53e7d51c9351f4b1c6d7573729558 hdf-java-2.9-src.tar
More information about the scm-commits
mailing list