- more cmake fixes

- rel 3

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 4e611cae6c70a3cc55179906c56b61f7094e5b3b..d1656a1221968b0954c4410a1c5128d1a0e7b4fe 100644 (file)
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -164,3 +164,11 @@
  endif ()
  
  if (HDF5_BUILD_SHARED_LIBS)
+@@ -141,6 +141,3 @@
+       endif ()
+     endif ()
+   endforeach ()
+-
+-  check_required_components(${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
+-  
+\ No newline at end of file

diff --git a/hdf5.spec b/hdf5.spec
index e676094f112357a6b000a115859e43154456c3cd..f2233f4851b78da2f885d07cb7d045aac0789119 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:       2
+Release:       3
 License:       Nearly BSD, but changed sources must be marked
 Group:         Libraries
 Source0:       ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
@@ -252,7 +252,7 @@ for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake hdf5-targets
            %{?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_SHARE_INSTALL_DIR@,%{_datadir}/cmake/hdf5,' \
            -e 's,@PACKAGE_CURRENT_BUILD_DIR@,%{_prefix},' \
                config/cmake/${f}.in > $RPM_BUILD_ROOT%{_datadir}/cmake/hdf5/$f
 done