- updated to 1.8.16 (note: new c++ libs sonames)

- updated config,cmake patches
- linux-lfs is always enabled now

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index d1656a1221968b0954c4410a1c5128d1a0e7b4fe..4054671a0a3fc91a8b302993cea4d4003194e91e 100644 (file)
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -136,8 +136,8 @@
 +
 +# Commands beyond this point should not need to know the version.
 +SET(CMAKE_IMPORT_FILE_VERSION)
---- hdf5-1.8.15/config/cmake/hdf5-config.cmake.in~     2015-05-01 20:36:45.000000000 +0200
-+++ hdf5-1.8.15/config/cmake/hdf5-config.cmake.in      2015-07-13 22:14:01.374454258 +0200
+--- hdf5-1.8.16/config/cmake/hdf5-config.cmake.in.orig 2015-10-24 07:14:03.000000000 +0200
++++ hdf5-1.8.16/config/cmake/hdf5-config.cmake.in      2015-11-26 21:14:53.838328233 +0100
 @@ -1,7 +1,6 @@
  #-----------------------------------------------------------------------------
  # HDF5 Config file for compiling against hdf5 build/install directory
@@ -146,16 +146,16 @@
  
  string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
  
-@@ -45,7 +45,7 @@
+@@ -47,7 +46,7 @@
  set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH}")
  
  set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
 -set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
 +set (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
  
- if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
-   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@")
-@@ -65,7 +65,7 @@
+ if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
+   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
+@@ -63,7 +62,7 @@
  
  if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
    set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
@@ -163,12 +163,12 @@
 +  set (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
  endif ()
  
- if (HDF5_BUILD_SHARED_LIBS)
-@@ -141,6 +141,3 @@
-       endif ()
+ #-----------------------------------------------------------------------------
+@@ -154,7 +153,3 @@
      endif ()
    endforeach ()
+ endforeach ()
 -
--  check_required_components(${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
--  
-\ No newline at end of file
+-foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE)
+-  check_required_components(${HDF5_PACKAGE_NAME}_${libtype})
+-endforeach ()

diff --git a/hdf5-config.patch b/hdf5-config.patch
index dd56e51099116ecb19683581a1bd2b2983a7c0a3..277dd4928bfb3c8b13acc59beef1c99a035ba357 100644 (file)
--- a/hdf5-config.patch
+++ b/hdf5-config.patch
@@ -1,19 +1,15 @@
---- hdf5-1.8.5-patch1/config/gnu-flags.orig    2010-08-26 16:21:53.000000000 +0200
-+++ hdf5-1.8.5-patch1/config/gnu-flags 2010-10-05 22:12:48.883739367 +0200
-@@ -145,16 +145,12 @@
+--- hdf5-1.8.16/config/gnu-flags.orig  2015-11-26 21:06:26.741682874 +0100
++++ hdf5-1.8.16/config/gnu-flags       2015-11-26 21:08:37.605010716 +0100
+@@ -99,10 +99,10 @@
      # Production
      case "$cc_vendor-$cc_version" in
-       gcc-2.95.[34])
+       gcc-[34].*)
 -        PROD_CFLAGS="-O3"
++        PROD_CFLAGS=
          ;;
-       gcc-3.*)
--        PROD_CFLAGS="-O3"
-         ;;
-       gcc-4.*)
--        PROD_CFLAGS="-O3"
+       gcc-5.*)
+-        PROD_CFLAGS="-O3 -fstdarg-opt"
++        PROD_CFLAGS="-fstdarg-opt"
          ;;
        *)
--        PROD_CFLAGS="-O"
-         ;;
-     esac
- 
+         PROD_CFLAGS="-O -finline-functions"

diff --git a/hdf5.spec b/hdf5.spec
index e22651f0945c3af46c6e35a3bbcc4fbfca34391e..f9fc31b861058e6d76eeffc5115b8a4e1eb7ccb1 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -10,12 +10,12 @@
 Summary:       Hierarchical Data Format 5 library
 Summary(pl.UTF-8):     Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
-Version:       1.8.15
-Release:       4
+Version:       1.8.16
+Release:       1
 License:       Nearly BSD, but changed sources must be marked
 Group:         Libraries
 Source0:       ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
-# Source0-md5: c3cfd7aeca8ca15160d9784af6748ac4
+# Source0-md5: 79c1593573ebddf734eee8d43ecfe483
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-sig.patch
 Patch2:                %{name}-cmake.patch
@@ -189,7 +189,6 @@ Narzędzia do konwersji z i to formatu HDF5.
        --enable-cxx \
        --enable-fortran \
        %{?with_fortran2003:--enable-fortran2003} \
-       --enable-linux-lfs \
        %{?with_mpi:--enable-parallel --enable-unsupported} \
        --enable-production \
        --enable-shared \
@@ -354,9 +353,9 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhdf5_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.10
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.11
 %attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.10
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.11
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -391,6 +390,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/H5Library.h
 %{_includedir}/H5Location.h
 %{_includedir}/H5Object.h
+%{_includedir}/H5OcreatProp.h
 %{_includedir}/H5PacketTable.h
 %{_includedir}/H5PredType.h
 %{_includedir}/H5PropList.h