[packages/hdf5] - updated to 1.8.14 (note: new sonames) - updated sig patch - added link patch (avoid -L%{_libdir} t
qboosh
qboosh at pld-linux.org
Sat Nov 15 19:12:07 CET 2014
commit 11f4d7aeec34e543e16174e0e2a4eba9d5084b6d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Nov 15 19:12:22 2014 +0100
- updated to 1.8.14 (note: new sonames)
- updated sig patch
- added link patch (avoid -L%{_libdir} to fix linking with older hdf5 installed)
hdf5-link.patch | 15 +++++++++++++++
hdf5-sig.patch | 8 ++++----
hdf5.spec | 20 +++++++++++---------
3 files changed, 30 insertions(+), 13 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index 0790e23..b426f4e 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -9,15 +9,16 @@
Summary: Hierarchical Data Format 5 library
Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5)
Name: hdf5
-Version: 1.8.13
+Version: 1.8.14
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: b060bb137d6bd8accf8f0c4c59d2746d
+# Source0-md5: 719df6d46eea52e42dd97d59dcbf5311
Patch0: %{name}-config.patch
Patch1: %{name}-sig.patch
Patch2: %{name}-cmake.patch
+Patch3: %{name}-link.patch
URL: http://www.hdfgroup.org/HDF5/
BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.11
@@ -172,6 +173,7 @@ Narzędzia do konwersji z i to formatu HDF5.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -263,9 +265,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc COPYING README.txt release_docs/{HISTORY*.txt,RELEASE.txt}
%attr(755,root,root) %{_libdir}/libhdf5.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5.so.8
+%attr(755,root,root) %ghost %{_libdir}/libhdf5.so.9
%attr(755,root,root) %{_libdir}/libhdf5_hl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.8
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.9
# used to show configuration at runtime
%{_libdir}/libhdf5.settings
@@ -336,9 +338,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.8
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.9
%attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.8
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.9
%files c++-devel
%defattr(644,root,root,755)
@@ -389,9 +391,9 @@ rm -rf $RPM_BUILD_ROOT
%files fortran
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libhdf5_fortran.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_fortran.so.8
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_fortran.so.9
%attr(755,root,root) %{_libdir}/libhdf5hl_fortran.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.8
+%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.9
%files fortran-devel
%defattr(644,root,root,755)
@@ -432,7 +434,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/h5t.mod
%{_includedir}/h5t_provisional.mod
%{_includedir}/h5tb.mod
-%{_includedir}/h5test_kind_sizeof_mod.mod
+%{_includedir}/h5test_kind_storage_size_mod.mod
%{_includedir}/h5z.mod
%{_includedir}/hdf5.mod
diff --git a/hdf5-link.patch b/hdf5-link.patch
new file mode 100644
index 0000000..6cc6235
--- /dev/null
+++ b/hdf5-link.patch
@@ -0,0 +1,15 @@
+--- hdf5-1.8.14/configure.ac.orig 2014-11-14 22:11:38.755722107 +0100
++++ hdf5-1.8.14/configure.ac 2014-11-14 22:49:25.102293632 +0100
+@@ -115,12 +115,6 @@
+ AM_CXXFLAGS="${AM_CXXFLAGS}"
+ AM_FCFLAGS="${AM_FCFLAGS}"
+ AM_CPPFLAGS="${AM_CPPFLAGS}"
+-# Added to address HDFFV-8944
+-if test "x$prefix" = xNONE; then
+- AM_LDFLAGS="$AM_LDFLAGS -L$ac_default_prefix/lib"
+-else
+- AM_LDFLAGS="$AM_LDFLAGS -L$prefix/lib"
+-fi
+ CFLAGS="${CFLAGS}"
+ CXXFLAGS="${CXXFLAGS}"
+ FCFLAGS="${FCFLAGS}"
diff --git a/hdf5-sig.patch b/hdf5-sig.patch
index 8263044..8334231 100644
--- a/hdf5-sig.patch
+++ b/hdf5-sig.patch
@@ -1,13 +1,13 @@
---- hdf5-1.8.10/configure.ac.orig 2012-11-17 08:06:27.640320676 +0100
-+++ hdf5-1.8.10/configure.ac 2012-11-17 08:07:46.110319039 +0100
-@@ -2199,10 +2199,15 @@
+--- hdf5-1.8.14/configure.ac.orig 2014-11-14 21:04:02.769225653 +0100
++++ hdf5-1.8.14/configure.ac 2014-11-14 21:06:03.502553920 +0100
+@@ -2253,10 +2253,15 @@
AC_CHECK_FUNCS([alarm BSDgettimeofday fork frexpf frexpl])
AC_CHECK_FUNCS([gethostname getpwuid getrusage lstat])
AC_CHECK_FUNCS([rand_r random setsysinfo])
-AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask])
+AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigprocmask])
AC_CHECK_FUNCS([snprintf srandom strdup symlink system])
- AC_CHECK_FUNCS([tmpfile vasprintf waitpid])
+ AC_CHECK_FUNCS([tmpfile asprintf vasprintf waitpid])
+dnl cannot be detected in glibc by plain AC_CHECK_FUNCS
+AH_TEMPLATE([HAVE_SIGSETJMP], [Have sigsetjmp function])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/11f4d7aeec34e543e16174e0e2a4eba9d5084b6d
More information about the pld-cvs-commit
mailing list