- updated to 1.8.15 (note: new sonames)

- updated sig patch
- removed obsolete link patch
- added format patch (fixes build with -Werror=format-security)

diff --git a/hdf5-format.patch b/hdf5-format.patch
new file mode 100644 (file)
index 0000000..43620e9
--- /dev/null
+++ b/hdf5-format.patch
@@ -0,0 +1,20 @@
+--- hdf5-1.8.15/test/error_test.c.orig 2015-05-01 20:36:27.000000000 +0200
++++ hdf5-1.8.15/test/error_test.c      2015-05-20 18:28:01.999946222 +0200
+@@ -498,7 +498,7 @@
+     if(err_num != 0) TEST_ERROR
+ 
+     /* Push an error with a long description */
+-    if(H5Epush(estack_id, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, err_msg) < 0) TEST_ERROR;
++    if(H5Epush(estack_id, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, "%s", err_msg) < 0) TEST_ERROR;
+ 
+     /* Check the number of errors on stack */
+     err_num = H5Eget_num(estack_id);
+@@ -543,7 +543,7 @@
+     herr_t      ret;                 /* Generic return value */
+ 
+     /* Push an error with a long description */
+-    if(H5Epush(H5E_DEFAULT, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, err_msg) < 0) TEST_ERROR;
++    if(H5Epush(H5E_DEFAULT, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, "%s", err_msg) < 0) TEST_ERROR;
+ 
+     /* Check the number of errors on stack */
+     err_num = H5Eget_num(H5E_DEFAULT);

diff --git a/hdf5-link.patch b/hdf5-link.patch
deleted file mode 100644 (file)
index 6cc6235..0000000
--- a/hdf5-link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 83342314ae6fbf5a5572ccdaadd573f27cc8319d..10469e907b42b96012694b7b3cd18d1716f56ec2 100644 (file)
--- a/hdf5-sig.patch
+++ b/hdf5-sig.patch
@@ -1,19 +1,19 @@
---- 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])
+--- hdf5-1.8.15/configure.ac.orig      2015-05-20 17:40:38.246732231 +0200
++++ hdf5-1.8.15/configure.ac   2015-05-20 17:41:46.156729379 +0200
+@@ -1643,10 +1643,15 @@
+ AC_CHECK_FUNCS([alarm clock_gettime difftime fork frexpf frexpl])
+ AC_CHECK_FUNCS([gethostname getpwuid getrusage gettimeofday])
+ AC_CHECK_FUNCS([lstat 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 asprintf vasprintf waitpid])
+ AC_CHECK_FUNCS([tmpfile asprintf vasprintf vsnprintf waitpid])
  
 +dnl cannot be detected in glibc by plain AC_CHECK_FUNCS
 +AH_TEMPLATE([HAVE_SIGSETJMP], [Have sigsetjmp function])
 +AC_CHECK_FUNC([sigsetjmp], [AC_DEFINE([HAVE_SIGSETJMP])],
 +      [AC_CHECK_FUNC([__sigsetjmp], [AC_DEFINE([HAVE_SIGSETJMP])])])
 +
- ## Check for vsnprintf() separately, so we can detect situations where it
- ## doesn't return the correct size for formatted strings that are too large
- ## for the buffer provided
+ ## ----------------------------------------------------------------------
+ ## Check compiler characteristics
+ ##

diff --git a/hdf5.spec b/hdf5.spec
index c3ca2c53f331a675c4561b597076548a2f5fe868..4a91e07ff030d58836c6da7363fde8d4fe15aada 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -10,16 +10,16 @@
 Summary:       Hierarchical Data Format 5 library
 Summary(pl.UTF-8):     Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
-Version:       1.8.14
-Release:       3
+Version:       1.8.15
+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: 719df6d46eea52e42dd97d59dcbf5311
+# Source0-md5: c3cfd7aeca8ca15160d9784af6748ac4
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-sig.patch
 Patch2:                %{name}-cmake.patch
-Patch3:                %{name}-link.patch
+Patch3:                %{name}-format.patch
 URL:           http://www.hdfgroup.org/HDF5/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11
@@ -224,7 +224,7 @@ vmajor=$(sed -ne 's/^#define H5_VERS_MAJOR\s*\([0-9]\+\).*/\1/p' src/H5public.h)
 vminor=$(sed -ne 's/^#define H5_VERS_MINOR\s*\([0-9]\+\).*/\1/p' src/H5public.h)
 vrel=$(sed -ne 's/^#define H5_VERS_RELEASE\s*\([0-9]\+\).*/\1/p' src/H5public.h)
 vsubr=$(sed -ne 's/^#define H5_VERS_SUBRELEASE\s*\([^ \t]\+\).*/\1/p' src/H5public.h)
-for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake.install hdf5-targets.cmake hdf5-targets-noconfig.cmake ; do
+for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-targets-noconfig.cmake ; do
        sed -e 's,@HDF5_PACKAGE@,hdf5,' \
            -e 's,@HDF_PACKAGE_EXT@,,' \
            -e "s,@HDF5_VERSION_STRING@,%{version}," \
@@ -251,7 +251,6 @@ for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake.install hdf5
            -e "s,@lib@,%{_lib}," \
                config/cmake/${f}.in > $RPM_BUILD_ROOT%{_datadir}/cmake/hdf5/$f
 done
-mv $RPM_BUILD_ROOT%{_datadir}/cmake/hdf5/hdf5-config.cmake{.install,}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -269,9 +268,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.9
+%attr(755,root,root) %ghost %{_libdir}/libhdf5.so.10
 %attr(755,root,root) %{_libdir}/libhdf5_hl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.9
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.10
 # used to show configuration at runtime
 %{_libdir}/libhdf5.settings
 
@@ -312,6 +311,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/H5PTpublic.h
 %{_includedir}/H5Ppublic.h
 %{_includedir}/H5PLextern.h
+%{_includedir}/H5PLpublic.h
 %{_includedir}/H5Rpublic.h
 %{_includedir}/H5Spublic.h
 %{_includedir}/H5TBpublic.h
@@ -342,9 +342,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.9
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.10
 %attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.9
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.10
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -395,9 +395,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.9
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_fortran.so.10
 %attr(755,root,root) %{_libdir}/libhdf5hl_fortran.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.9
+%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.10
 
 %files fortran-devel
 %defattr(644,root,root,755)