[packages/hdf5] - more cmake fixes - rel 3

[baggins]

commit de86ac81ec7c78986b86c21421e4c070e0a7bb68
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jul 13 23:11:15 2015 +0200

    - more cmake fixes
    - rel 3

 hdf5-cmake.patch | 8 ++++++++
 hdf5.spec        | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index e676094..f2233f4 100644
--- 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, at MPI_C_INCLUDE_PATH@,%{_includedir},'} \
 	    %{?with_mpi:-e 's, at MPI_C_LIBRARIES@,%{_libdir},'} \
 	    -e 's, at PACKAGE_INCLUDE_INSTALL_DIR@,%{_includedir},' \
-	    -e 's, at PACKAGE_SHARE_INSTALL_DIR@,%{_datadir},' \
+	    -e 's, at PACKAGE_SHARE_INSTALL_DIR@,%{_datadir}/cmake/hdf5,' \
 	    -e 's, at PACKAGE_CURRENT_BUILD_DIR@,%{_prefix},' \
 		config/cmake/${f}.in > $RPM_BUILD_ROOT%{_datadir}/cmake/hdf5/$f
 done
diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 4e611ca..d1656a1 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/de86ac81ec7c78986b86c21421e4c070e0a7bb68