- updated to 1.8.11 (note: new sonames)

- removed obsolete link patch

diff --git a/hdf5-link.patch b/hdf5-link.patch
deleted file mode 100644 (file)
index fe93792..0000000
--- a/hdf5-link.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- hdf5-1.8.6/c++/src/Makefile.am.orig        2011-02-14 17:23:42.000000000 +0100
-+++ hdf5-1.8.6/c++/src/Makefile.am     2011-05-03 22:01:04.307748409 +0200
-@@ -28,6 +28,7 @@
- lib_LTLIBRARIES=libhdf5_cpp.la
- 
- # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
-+libhdf5_cpp_la_LIBADD=$(top_builddir)/src/libhdf5.la
- libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
- 
- # Shared C++ libraries aren't universally supported.
---- hdf5-1.8.1/hl/src/Makefile.am.orig 2008-05-29 18:39:01.000000000 +0200
-+++ hdf5-1.8.1/hl/src/Makefile.am      2008-06-05 00:28:00.446476110 +0200
-@@ -27,6 +27,7 @@
- lib_LTLIBRARIES=libhdf5_hl.la
- 
- libhdf5_hl_la_SOURCES=H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c
-+libhdf5_hl_la_LIBADD=$(top_builddir)/src/libhdf5.la
- 
- # Public header files (to be installed)
- include_HEADERS=hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
---- hdf5-1.8.1/hl/c++/src/Makefile.am.orig     2008-05-29 18:39:01.000000000 +0200
-+++ hdf5-1.8.1/hl/c++/src/Makefile.am  2008-06-05 00:29:14.914717299 +0200
-@@ -35,6 +35,7 @@
- # Source files for the library
- # At the moment, only the H5PT Packet Table has a C++ API.
- libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
-+libhdf5_hl_cpp_la_LIBADD=$(top_builddir)/hl/src/libhdf5_hl.la
- 
- # Public headers
- include_HEADERS=H5PacketTable.h

diff --git a/hdf5.spec b/hdf5.spec
index 253e36059d94bd190c9c61e4efe758e521f566b9..1484c02d685d8e24295d0c0710a759779e587f49 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -9,16 +9,15 @@
 Summary:       Hierarchical Data Format 5 library
 Summary(pl.UTF-8):     Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
-Version:       1.8.10
-Release:       3
+Version:       1.8.11
+Release:       1
 License:       Nearly BSD, but changed sources must be marked
 Group:         Libraries
-Source0:       ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}-patch1.tar.bz2
-# Source0-md5: 86cd479b7a34abe916e2fec8b7280863
+Source0:       ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 3433c1be767d2b8e5b0771a3209b4fcc
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-sig.patch
-Patch2:                %{name}-link.patch
-Patch3:                %{name}-cmake.patch
+Patch2:                %{name}-cmake.patch
 URL:           http://www.hdfgroup.org/HDF5/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11
@@ -169,11 +168,10 @@ Utilities to convert from/to HDF5 format.
 Narzędzia do konwersji z i to formatu HDF5.
 
 %prep
-%setup -q -n %{name}-%{version}-patch1
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -265,9 +263,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.7
+%attr(755,root,root) %ghost %{_libdir}/libhdf5.so.8
 %attr(755,root,root) %{_libdir}/libhdf5_hl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.7
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.8
 # used to show configuration at runtime
 %{_libdir}/libhdf5.settings
 
@@ -281,6 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/H5ACpublic.h
 %{_includedir}/H5Apublic.h
 %{_includedir}/H5Cpublic.h
+%{_includedir}/H5DOpublic.h
 %{_includedir}/H5DSpublic.h
 %{_includedir}/H5Dpublic.h
 %{_includedir}/H5Epubgen.h
@@ -307,6 +306,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/H5Opublic.h
 %{_includedir}/H5PTpublic.h
 %{_includedir}/H5Ppublic.h
+%{_includedir}/H5PLextern.h
 %{_includedir}/H5Rpublic.h
 %{_includedir}/H5Spublic.h
 %{_includedir}/H5TBpublic.h
@@ -319,8 +319,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/H5version.h
 %{_includedir}/hdf5.h
 %{_includedir}/hdf5_hl.h
+
 %{_datadir}/cmake/hdf5
 %dir %{_examplesdir}/%{name}-%{version}
+%{_examplesdir}/%{name}-%{version}/README
 %{_examplesdir}/%{name}-%{version}/run-all-ex.sh
 %{_examplesdir}/%{name}-%{version}/c
 %dir %{_examplesdir}/%{name}-%{version}/hl
@@ -335,9 +337,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.7
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.8
 %attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.7
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.8
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -387,9 +389,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.7
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_fortran.so.8
 %attr(755,root,root) %{_libdir}/libhdf5hl_fortran.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.7
+%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.8
 
 %files fortran-devel
 %defattr(644,root,root,755)
@@ -409,6 +411,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/h5e.mod
 %{_includedir}/h5e_provisional.mod
 %{_includedir}/h5f.mod
+%{_includedir}/h5f_provisional.mod
 %{_includedir}/h5fortran_types.mod
 %{_includedir}/h5g.mod
 %{_includedir}/h5global.mod