SPECS: hdf5.spec - updated to 1.8.1 - updated config, sig patches, added lin...

[qboosh]

Author: qboosh                       Date: Thu Jun  5 16:11:05 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.8.1
- updated config,sig patches, added link patch

---- Files affected:
SPECS:
   hdf5.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/hdf5.spec
diff -u SPECS/hdf5.spec:1.33 SPECS/hdf5.spec:1.34
--- SPECS/hdf5.spec:1.33	Thu Jun 14 20:20:28 2007
+++ SPECS/hdf5.spec	Thu Jun  5 18:11:00 2008
@@ -9,16 +9,17 @@
 Summary:	Hierarchical Data Format 5 library
 Summary(pl.UTF-8):	Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:		hdf5
-Version:	1.6.5
-Release:	3
+Version:	1.8.1
+Release:	1
 Group:		Libraries
 License:	Nearly BSD, but changed sources must be marked
-Source0:	ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/%{name}-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	67187b3253b89f1f41756b7fd4396ecf
+Source0:	ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	db983df70a69f8d0d87314ad1ccc2256
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-sig.patch
+Patch2:		%{name}-link.patch
 URL:		http://hdf.ncsa.uiuc.edu/HDF5/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libstdc++-devel
@@ -89,24 +90,24 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-cd c++
-%{__aclocal}
-%{__autoconf}
-cd ..
+%{__autoheader}
+%{__automake}
 %configure \
+	--docdir=%{_docdir} \
 	--enable-cxx \
 	--enable-linux-lfs \
-	--enable-threadsafe \
 	--enable-production \
 	--with-pthread \
 	--with-ssl \
 	%{?with_szip:--with-szlib}
 
+#	--enable-threadsafe is incompatible with cxx/fortran
 #	--enable-fortran  - requires Fortran90 compiler
 
 %{__make}
@@ -121,11 +122,11 @@
 	bindir=$RPM_BUILD_ROOT%{_bindir} \
 	docdir=$RPM_BUILD_ROOT%{_docdir}
 
-find doc -name Dependencies -o -name Makefile\* | xargs rm -f
-
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-mv -f $RPM_BUILD_ROOT%{_docdir}/hdf5/examples/{c,c++} \
-	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__make} -C examples install-examples \
+	EXAMPLEDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c
+%{__make} -C c++/examples install-examples \
+	EXAMPLEDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c++
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,24 +136,31 @@
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README.txt release_docs/{HISTORY.txt,RELEASE.txt}
+%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.5
 %attr(755,root,root) %{_libdir}/libhdf5_cpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.0
 %attr(755,root,root) %{_libdir}/libhdf5_hl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.0
+%attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.0
 # used to show configuration at runtime
 %{_libdir}/libhdf5.settings
-%{_libdir}/libhdf5_cpp.settings
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/html
 %attr(755,root,root) %{_libdir}/libhdf5.so
 %attr(755,root,root) %{_libdir}/libhdf5_cpp.so
 %attr(755,root,root) %{_libdir}/libhdf5_hl.so
+%attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so
 %{_libdir}/libhdf5.la
 %{_libdir}/libhdf5_cpp.la
 %{_libdir}/libhdf5_hl.la
-%{_includedir}/*.h
+%{_libdir}/libhdf5_hl_cpp.la
+%{_includedir}/H5*.h
+%{_includedir}/hdf5.h
+%{_includedir}/hdf5_hl.h
 %{_examplesdir}/%{name}-%{version}
 
 %files static
@@ -160,6 +168,7 @@
 %{_libdir}/libhdf5.a
 %{_libdir}/libhdf5_cpp.a
 %{_libdir}/libhdf5_hl.a
+%{_libdir}/libhdf5_hl_cpp.a
 
 %files progs
 %defattr(644,root,root,755)
@@ -171,6 +180,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2008-06-05 16:11:00  qboosh
+- updated to 1.8.1
+- updated config,sig patches, added link patch
+
 Revision 1.33  2007-06-14 18:20:28  arekm
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hdf5.spec?r1=1.33&r2=1.34&f=u