- fix cmake files breakage

- rel 2

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 80577a8e06324a81eefc874a4851e1c969382e70..4e611cae6c70a3cc55179906c56b61f7094e5b3b 100644 (file)
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -136,3 +136,31 @@
 +
 +# 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
+@@ -1,7 +1,6 @@
+ #-----------------------------------------------------------------------------
+ # HDF5 Config file for compiling against hdf5 build/install directory
+ #-----------------------------------------------------------------------------
+-@PACKAGE_INIT@
+ 
+ string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
+ 
+@@ -45,7 +45,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_TOOLS)
+   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-  set_and_check (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
++  set (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
+ endif ()
+ 
+ if (HDF5_BUILD_SHARED_LIBS)

diff --git a/hdf5.spec b/hdf5.spec
index 4a91e07ff030d58836c6da7363fde8d4fe15aada..e676094f112357a6b000a115859e43154456c3cd 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -11,7 +11,7 @@ Summary:      Hierarchical Data Format 5 library
 Summary(pl.UTF-8):     Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
 Version:       1.8.15
-Release:       1
+Release:       2
 License:       Nearly BSD, but changed sources must be marked
 Group:         Libraries
 Source0:       ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
@@ -248,7 +248,12 @@ for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake hdf5-targets
            -e 's,@ZLIB_PACKAGE_NAME@,zlib,' \
            -e 's,@SZIP_PACKAGE_NAME@,szip,' \
            -e 's,@HDF5_LIBRARIES_TO_EXPORT@,hdf5,' \
-           -e "s,@lib@,%{_lib}," \
+           -e 's,@lib@,%{_lib},' \
+           %{?with_mpi:-e 's,@MPI_C_INCLUDE_PATH@,%{_includedir},'} \
+           %{?with_mpi:-e 's,@MPI_C_LIBRARIES@,%{_libdir},'} \
+           -e 's,@PACKAGE_INCLUDE_INSTALL_DIR@,%{_includedir},' \
+           -e 's,@PACKAGE_SHARE_INSTALL_DIR@,%{_datadir},' \
+           -e 's,@PACKAGE_CURRENT_BUILD_DIR@,%{_prefix},' \
                config/cmake/${f}.in > $RPM_BUILD_ROOT%{_datadir}/cmake/hdf5/$f
 done