Accepting request 415427 from science:unstable

version update

OBS-URL: https://build.opensuse.org/request/show/415427
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=31

baselibs.conf

@@ -1,17 +1,17 @@
-libhdf5-10
+libhdf5-100
-libhdf5-10-openmpi
+libhdf5-100-openmpi
-libhdf5-10-mvapich2
+libhdf5-100-mvapich2
-libhdf5_hl10
+libhdf5_hl100
-libhdf5_hl10-mvapich2
+libhdf5_hl100-mvapich2
-libhdf5_hl10-openmpi
+libhdf5_hl100-openmpi
-libhdf5_cpp12
+libhdf5_cpp100
-libhdf5_hl_cpp11
+libhdf5_hl_cpp100
-libhdf5_fortran10
+libhdf5_fortran100
-libhdf5_fortran10-openmpi
+libhdf5_fortran100-openmpi
-libhdf5_fortran10-mvapich2
+libhdf5_fortran100-mvapich2
-libhdf5hl_fortran10
+libhdf5hl_fortran100
-libhdf5hl_fortran10-mvapich2
+libhdf5hl_fortran100-mvapich2
-libhdf5hl_fortran10-openmpi
+libhdf5hl_fortran100-openmpi
 hdf5-devel
   requires -<targettype>
   requires "libhdf5-10-<targettype> = <version>"

hdf5-1.10.0-patch1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f772264dd853dceb18855418a81c63c9cdcca7bcd075b9c54eb516af006fdfba
+size 11233647

hdf5-1.8.11-abort_unknown_host_config.patch

@@ -2,7 +2,7 @@ Index: configure
 ===================================================================
 --- configure.orig
 +++ configure
-@@ -4214,6 +4214,8 @@ done
+@@ -4085,6 +4085,8 @@ done
  if test "X$host_config" != "Xnone"; then
    CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
    . $host_config
@@ -15,7 +15,7 @@ Index: configure.ac
 ===================================================================
 --- configure.ac.orig
 +++ configure.ac
-@@ -305,6 +305,8 @@ done
+@@ -266,6 +266,8 @@ done
  if test "X$host_config" != "Xnone"; then
    CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
    . $host_config

hdf5-1.8.17.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc35dd8fd8d398de6b525b27cc111c21fc79795ad6db1b1f12cb15ed1ee8486a
-size 10030234

hdf5-LD_LIBRARY_PATH.patch

@@ -1,8 +1,8 @@
-Index: hdf5-1.8.14/src/Makefile.in
+Index: hdf5-1.10.0-patch1/src/Makefile.in
 ===================================================================
---- hdf5-1.8.14.orig/src/Makefile.in
+--- hdf5-1.10.0-patch1.orig/src/Makefile.in
-+++ hdf5-1.8.14/src/Makefile.in
++++ hdf5-1.10.0-patch1/src/Makefile.in
-@@ -1667,8 +1667,6 @@ help:
+@@ -1847,8 +1847,6 @@ help:
  # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
  # is set to ignore the error.
  H5Tinit.c: H5detect$(EXEEXT)
@@ -11,7 +11,7 @@ Index: hdf5-1.8.14/src/Makefile.in
  	$(RUNSERIAL) ./H5detect$(EXEEXT) > $@  ||                               \
  	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
  	    ($(RM) $@ ; exit 1)
-@@ -1679,8 +1677,6 @@ H5Tinit.c: H5detect$(EXEEXT)
+@@ -1859,8 +1857,6 @@ H5Tinit.c: H5detect$(EXEEXT)
  # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
  # is set to ignore the error.
  H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings

hdf5-buildcompare.patch

@@ -3,11 +3,11 @@
  src/libhdf5.settings.in |    3 ---
  2 files changed, 15 deletions(-)
 
-Index: hdf5-1.8.15/src/H5detect.c
+Index: hdf5-1.10.0-patch1/src/H5detect.c
 ===================================================================
---- hdf5-1.8.15.orig/src/H5detect.c
+--- hdf5-1.10.0-patch1.orig/src/H5detect.c
-+++ hdf5-1.8.15/src/H5detect.c
++++ hdf5-1.10.0-patch1/src/H5detect.c
-@@ -1308,18 +1308,6 @@ bit.\n";
+@@ -1311,18 +1311,6 @@ bit.\n";
      printf("/* Generated automatically by H5detect -- do not edit */\n\n\n");
      HDputs(FileHeader);		/*the copyright notice--see top of this file */
  
@@ -26,19 +26,18 @@ Index: hdf5-1.8.15/src/H5detect.c
      printf(" *\n * Purpose:\t\t");
      for (s = purpose; *s; s++) {
  	HDputchar(*s);
-Index: hdf5-1.8.15/src/libhdf5.settings.in
+Index: hdf5-1.10.0-patch1/src/libhdf5.settings.in
 ===================================================================
---- hdf5-1.8.15.orig/src/libhdf5.settings.in
+--- hdf5-1.10.0-patch1.orig/src/libhdf5.settings.in
-+++ hdf5-1.8.15/src/libhdf5.settings.in
++++ hdf5-1.10.0-patch1/src/libhdf5.settings.in
-@@ -4,11 +4,8 @@
+@@ -4,10 +4,7 @@
  General Information:
  -------------------
                     HDF5 Version: @H5_VERSION@
 -                  Configured on: @CONFIG_DATE@
 -                  Configured by: @CONFIG_USER@
- 		 Configure mode: @CONFIG_MODE@
                      Host system: @host_cpu@-@host_vendor@-@host_os@
 -              Uname information: @UNAME_INFO@
                         Byte sex: @BYTESEX@
- 		      Libraries: @STATIC_SHARED@
               Installation point: @prefix@
+ 

hdf5-ldouble-ppc64le.patch

@@ -1,7 +1,8 @@
-diff -rupN hdf5-1.8.16.orig/configure hdf5-1.8.16/configure
+Index: hdf5-1.10.0-patch1/configure
---- hdf5-1.8.16.orig/configure	2015-11-10 15:01:10.000000000 +0100
+===================================================================
-+++ hdf5-1.8.16/configure	2016-01-28 13:44:58.136709651 +0100
+--- hdf5-1.10.0-patch1.orig/configure
-@@ -27347,6 +27347,14 @@ main ()
++++ hdf5-1.10.0-patch1/configure
+@@ -30356,6 +30356,14 @@ main ()
                  unsigned char       s2[8];
                  int                 ret = 1;
  
@@ -16,7 +17,7 @@ diff -rupN hdf5-1.8.16.orig/configure hdf5-1.8.16/configure
                  if(sizeof(long double) == 16 && sizeof(long) == 8) {
                      /*make sure the long double type has 16 bytes in size and
                       * 11 bits of exponent.  If it is,
-@@ -27464,6 +27472,14 @@ main ()
+@@ -30473,6 +30481,14 @@ main ()
                  unsigned char       s[16];
                  int                 flag=0, ret=1;
  
@@ -31,15 +32,14 @@ diff -rupN hdf5-1.8.16.orig/configure hdf5-1.8.16/configure
                  /*Determine if long double has 16 byte in size, 11 bit exponent, and
                   *the bias is 0x3ff */
                  if(sizeof(long double) == 16) {
-diff -rupN hdf5-1.8.16.orig/configure.ac hdf5-1.8.16/configure.ac
+Index: hdf5-1.10.0-patch1/configure.ac
---- hdf5-1.8.16.orig/configure.ac	2015-11-04 23:29:55.000000000 +0100
+===================================================================
-+++ hdf5-1.8.16/configure.ac	2016-01-28 13:44:58.144709750 +0100
+--- hdf5-1.10.0-patch1.orig/configure.ac
-@@ -2277,7 +2277,15 @@ else
++++ hdf5-1.10.0-patch1/configure.ac
-                 unsigned char       s[16];
+@@ -2813,6 +2813,14 @@ else
                  unsigned char       s2[8];
                  int                 ret = 1;
--                
+ 
-+
 +#if defined __powerpc64__ && defined _LITTLE_ENDIAN
 +                /* Don't bother checking on ppc64le, we know it'll work, and
 +                   that what hdf5 calls 'special algorithm' simply is
@@ -51,11 +51,10 @@ diff -rupN hdf5-1.8.16.orig/configure.ac hdf5-1.8.16/configure.ac
                  if(sizeof(long double) == 16 && sizeof(long) == 8) {
                      /*make sure the long double type has 16 bytes in size and
                       * 11 bits of exponent.  If it is,
-@@ -2354,6 +2362,14 @@ else
+@@ -2973,6 +2981,14 @@ else
-                 unsigned long       ull;
              unsigned char       s[16];
-                 int                 flag=0, ret=1;
+             int                 ret = 0;
-+
+ 
 +#if defined __powerpc64__ && defined _LITTLE_ENDIAN
 +                /* Don't bother checking on ppc64le, we know it'll work, and
 +                   that what hdf5 calls 'special algorithm' simply is
@@ -63,13 +62,15 @@ diff -rupN hdf5-1.8.16.orig/configure.ac hdf5-1.8.16/configure.ac
 +                   The check below assumes big endian.  */
 +                ret = 0;
 +#endif
-             
++
-                 /*Determine if long double has 16 byte in size, 11 bit exponent, and
+             if(sizeof(long double) == 16) {
-                  *the bias is 0x3ff */ 
+                 /*make sure the long double type is the same as the failing type
-diff -rupN hdf5-1.8.16.orig/test/dt_arith.c hdf5-1.8.16/test/dt_arith.c
+                  *which has 16 bytes in size and 11 bits of exponent.  If it is,
---- hdf5-1.8.16.orig/test/dt_arith.c	2015-10-24 07:13:43.000000000 +0200
+Index: hdf5-1.10.0-patch1/test/dt_arith.c
-+++ hdf5-1.8.16/test/dt_arith.c	2016-01-28 13:44:58.153709861 +0100
+===================================================================
-@@ -3010,7 +3010,18 @@ test_conv_flt_1 (const char *name, int r
+--- hdf5-1.10.0-patch1.orig/test/dt_arith.c
++++ hdf5-1.10.0-patch1/test/dt_arith.c
+@@ -3049,7 +3049,18 @@ test_conv_flt_1 (const char *name, int r
                          buf, saved, nelmts);
  #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
              } else if(src_type == FLT_LDOUBLE) {
@@ -89,7 +90,7 @@ diff -rupN hdf5-1.8.16.orig/test/dt_arith.c hdf5-1.8.16/test/dt_arith.c
                          buf, saved, nelmts);
  #endif
              } else
-@@ -3663,7 +3674,18 @@ test_conv_int_fp(const char *name, int r
+@@ -3710,7 +3721,18 @@ test_conv_int_fp(const char *name, int r
              INIT_FP_DENORM(long double, LDBL_MANT_DIG, src_size, src_nbits, sendian, dst_size,
                      buf, saved, nelmts);
          } else {

hdf5-non_void_return.patch

@@ -2,7 +2,7 @@ Index: test/dt_arith.c
 ===================================================================
 --- test/dt_arith.c.orig
 +++ test/dt_arith.c
-@@ -3497,6 +3497,7 @@ error:
+@@ -3382,6 +3382,7 @@ error:
      else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL)
          return 1;
  #endif
@@ -14,7 +14,7 @@ Index: tools/h5ls/h5ls.c
 ===================================================================
 --- tools/h5ls/h5ls.c.orig
 +++ tools/h5ls/h5ls.c
-@@ -2528,7 +2528,7 @@ out:
+@@ -2567,7 +2567,7 @@ out:
   *
   *-------------------------------------------------------------------------
   */
@@ -27,7 +27,7 @@ Index: tools/h5dump/h5dump.c
 ===================================================================
 --- tools/h5dump/h5dump.c.orig
 +++ tools/h5dump/h5dump.c
-@@ -208,7 +208,7 @@ static struct long_options l_opts[] = {
+@@ -210,7 +210,7 @@ static struct long_options l_opts[] = {
   *
   *-------------------------------------------------------------------------
   */
@@ -77,7 +77,7 @@ Index: tools/h5stat/h5stat.c
 ===================================================================
 --- tools/h5stat/h5stat.c.orig
 +++ tools/h5stat/h5stat.c
-@@ -223,7 +223,7 @@ static struct long_options l_opts[] = {
+@@ -250,7 +250,7 @@ static struct long_options l_opts[] = {
      { NULL, 0, '\0' }
  };
  

hdf5.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 26 15:50:22 UTC 2016 - adrian@suse.de
+
+- update to 1.10.0-patch1
+  https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/hdf5-1.10.0-patch1-RELEASE.txt
+
 -------------------------------------------------------------------
 Mon May 23 21:29:44 UTC 2016 - toddrme2178@gmail.com
 

hdf5.spec

@@ -27,22 +27,22 @@
 
 # TODO: The so numbers autodetected by update_so_version.sh
 # do not match the so numbers that are actually buit.
-%define sonum 10
+%define sonum 100
-%define sonum_CXX 12
+%define sonum_CXX 100
-%define sonum_F 10
+%define sonum_F 100
-%define sonum_HL 10
+%define sonum_HL 100
-%define sonum_HL_CXX 11
+%define sonum_HL_CXX 100
-%define sonum_HL_F 10
+%define sonum_HL_F 100
-%define sonum_TOOLS 10
+%define sonum_TOOLS 100
 
 Name:           hdf5
-Version:        1.8.17
+Version:        1.10.0
 Release:        0
 Summary:        Command-line programs for the HDF5 scientific data format
 License:        BSD-3-Clause
 Group:          Productivity/Scientific/Other
 Url:            http://www.hdfgroup.org/HDF5/
-Source0:        http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%{version}/src/hdf5-%{version}.tar.bz2
+Source0:        http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%{version}/src/hdf5-%{version}-patch1.tar.bz2
 Source1000:     baselibs.conf
 Source1001:     baselibs.conf.in
 Source1002:     update_so_version.sh
@@ -765,7 +765,7 @@ processing, visualization, and archiving.
 This package provides examples of HDF5 library use.
 
 %prep
-%setup -q
+%setup -q -n %name-%version-patch1
 %patch0 -p1 -b .LD_LIBRARY_PATH
 %patch1 -p0 -b .non_void_return
 %patch2 -p0 -b .abort_unknown_host_config
@@ -816,7 +816,7 @@ pushd build
   --enable-shared \
   --enable-cxx \
   --enable-threadsafe \
-  --enable-production \
+  --enable-build-mode=production \
   --with-pthread
 
 make V=1 %{?_smp_mflags}
@@ -845,7 +845,7 @@ export LD_LIBRARY_PATH="%{_libdir}/mpi/gcc/$mpi/%_lib"
   --enable-shared \
   --enable-threadsafe \
   --enable-parallel \
-  --enable-production \
+  --enable-build-mode=production \
   --with-pthread
 
 make %{?_smp_mflags}
@@ -940,10 +940,12 @@ done
 %defattr(-,root,root)
 %{_bindir}/gif2h5
 %{_bindir}/h52gif
+%{_bindir}/h5clear
 %{_bindir}/h5copy
 %{_bindir}/h5debug
 %{_bindir}/h5diff
 %{_bindir}/h5dump
+%{_bindir}/h5format_convert
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
@@ -954,12 +956,12 @@ done
 %{_bindir}/h5repart
 %{_bindir}/h5stat
 %{_bindir}/h5unjam
+%{_bindir}/h5watch
 
 %files -n libhdf5-%{sonum}
 %defattr(-,root,root)
 %doc COPYING ACKNOWLEDGMENTS README.txt
-%doc release_docs/HISTORY-1_0-1_8_0_rc3.txt
+%doc release_docs/HISTORY-1_8_0-1_10_0.txt
-%doc release_docs/HISTORY-1_8.txt
 %doc release_docs/RELEASE.txt
 %defattr(0755,root,root)
 %{_libdir}/libhdf5.so.%{sonum}
@@ -1006,6 +1008,9 @@ done
 
 %files devel
 %defattr(-,root,root)
+%doc release_docs/HISTORY-1_0-1_8_0_rc3.txt
+%doc release_docs/RELEASE.txt
+%doc ACKNOWLEDGMENTS README.txt
 %{_bindir}/h5c++
 %{_bindir}/h5cc
 %{_bindir}/h5fc
@@ -1027,10 +1032,12 @@ done
 %defattr(-,root,root)
 %{_libdir}/mpi/gcc/openmpi/bin/gif2h5
 %{_libdir}/mpi/gcc/openmpi/bin/h52gif
+%{_libdir}/mpi/gcc/openmpi/bin/h5clear
 %{_libdir}/mpi/gcc/openmpi/bin/h5copy
 %{_libdir}/mpi/gcc/openmpi/bin/h5debug
 %{_libdir}/mpi/gcc/openmpi/bin/h5diff
 %{_libdir}/mpi/gcc/openmpi/bin/h5dump
+%{_libdir}/mpi/gcc/openmpi/bin/h5format_convert
 %{_libdir}/mpi/gcc/openmpi/bin/h5import
 %{_libdir}/mpi/gcc/openmpi/bin/h5jam
 %{_libdir}/mpi/gcc/openmpi/bin/h5ls
@@ -1043,13 +1050,11 @@ done
 %{_libdir}/mpi/gcc/openmpi/bin/h5stat
 %{_libdir}/mpi/gcc/openmpi/bin/h5unjam
 %{_libdir}/mpi/gcc/openmpi/bin/ph5diff
+%{_libdir}/mpi/gcc/openmpi/bin/h5watch
 
 %files -n libhdf5-%{sonum}-openmpi
 %defattr(-,root,root)
 %doc COPYING ACKNOWLEDGMENTS README.txt
-%doc release_docs/HISTORY-1_0-1_8_0_rc3.txt
-%doc release_docs/HISTORY-1_8.txt
-%doc release_docs/RELEASE.txt
 %defattr(0755,root,root)
 %{_libdir}/mpi/gcc/openmpi/%{_lib}/libhdf5.so.%{sonum}
 %{_libdir}/mpi/gcc/openmpi/%{_lib}/libhdf5.so.%{sonum}.*
@@ -1113,10 +1118,7 @@ done
 
 %files -n libhdf5-%{sonum}-mvapich2
 %defattr(-,root,root)
-%doc COPYING ACKNOWLEDGMENTS README.txt
+%doc COPYING
-%doc release_docs/HISTORY-1_0-1_8_0_rc3.txt
-%doc release_docs/HISTORY-1_8.txt
-%doc release_docs/RELEASE.txt
 %defattr(0755,root,root)
 %{_libdir}/mpi/gcc/mvapich2/%{_lib}/libhdf5.so.%{sonum}
 %{_libdir}/mpi/gcc/mvapich2/%{_lib}/libhdf5.so.%{sonum}.*