- updated to 1.8.17 (note: new libhdf5_cpp soname)

- removed obsolete format patch

diff --git a/hdf5-format.patch b/hdf5-format.patch
deleted file mode 100644 (file)
index 43620e9..0000000
--- a/hdf5-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.spec b/hdf5.spec
index f9fc31b861058e6d76eeffc5115b8a4e1eb7ccb1..a5b2787a6e6b14b3a5ccab480a43ab23f2ebc245 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -10,16 +10,15 @@
 Summary:       Hierarchical Data Format 5 library
 Summary(pl.UTF-8):     Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
-Version:       1.8.16
+Version:       1.8.17
 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: 79c1593573ebddf734eee8d43ecfe483
+# Source0-md5: 34bd1afa5209259201a41964100d6203
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-sig.patch
 Patch2:                %{name}-cmake.patch
-Patch3:                %{name}-format.patch
 URL:           http://www.hdfgroup.org/HDF5/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11
@@ -175,7 +174,6 @@ Narzędzia do konwersji z i to formatu HDF5.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -353,7 +351,7 @@ 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.11
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.12
 %attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.11