rpms/hdf5/devel hdf5-1.6.6-tail.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hdf5.spec, 1.15, 1.16 sources, 1.3, 1.4 hdf5-1.6.4-gcc4.patch, 1.1, NONE hdf5-1.6.4-testh5repack.patch, 1.1, NONE hdf5-1.6.5-flags.patch, 1.3, NONE hdf5-1.6.5-h5diff_attr.patch, 1.1, NONE hdf5-1.6.5-memset.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31038

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.6-tail.patch 
Removed Files:
	hdf5-1.6.4-gcc4.patch hdf5-1.6.4-testh5repack.patch 
	hdf5-1.6.5-flags.patch hdf5-1.6.5-h5diff_attr.patch 
	hdf5-1.6.5-memset.patch 
Log Message:
* Wed Oct 17 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.6-1
- Update to 1.6.6, drop upstreamed patches
- Explicitly set compilers


hdf5-1.6.6-tail.patch:

--- NEW FILE hdf5-1.6.6-tail.patch ---
--- hdf5-1.6.6/tools/h5dump/testh5dump.sh.in.tail	2007-10-17 10:37:38.000000000 -0600
+++ hdf5-1.6.6/tools/h5dump/testh5dump.sh.in	2007-10-17 10:38:26.000000000 -0600
@@ -81,7 +81,7 @@
         nerrors="`expr $nerrors + 1`"
     else
 	# Skip the first three lines, which are label lines, before cmp.
-        if tail +4l $expect | $CMP - $actual; then
+        if tail -n +4 $expect | $CMP - $actual; then
 	    echo " PASSED"
         else
 	    echo "*FAILED*"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Dec 2005 21:07:16 -0000	1.3
+++ .cvsignore	17 Oct 2007 16:57:24 -0000	1.4
@@ -1 +1 @@
-hdf5-1.6.5.tar.gz
+hdf5-1.6.6.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hdf5.spec	24 Aug 2007 15:47:22 -0000	1.15
+++ hdf5.spec	17 Oct 2007 16:57:24 -0000	1.16
@@ -1,21 +1,17 @@
 Name: hdf5
-Version: 1.6.5
-Release: 9%{?dist}
+Version: 1.6.6
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/
 Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
-Patch0: hdf5-1.6.4-gcc4.patch
 Patch1: hdf5-1.6.4-destdir.patch
 Patch2: hdf5-1.6.4-norpath.patch
-Patch3: hdf5-1.6.4-testh5repack.patch
-Patch4: hdf5-1.6.5-h5diff_attr.patch
+Patch3: hdf5-1.6.6-tail.patch
 Patch5: hdf5-1.6.4-ppc.patch
-Patch6: hdf5-1.6.5-flags.patch
 Patch7: hdf5-1.6.5-x86_64.patch
 Patch8: hdf5-1.6.5-sort.patch
-Patch9: hdf5-1.6.5-memset.patch
 Patch10: hdf5-1.6.5-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
@@ -39,42 +35,45 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .flags
+%patch1 -p1 -b .destdir
+%patch2 -p1 -b .norpath
+%patch3 -p1 -b .tail
+%patch5 -p1 -b .ppc
 %patch7 -p1 -b .x86_64
 %patch8 -p1 -b .sort
-%patch9 -p1 -b .memset
 %patch10 -p1 -b .open
 
+
 %build
+export CC=gcc
+export CXX=g++
+export F9X=gfortran
 %configure --with-ssl --enable-cxx --enable-fortran \
            --enable-threadsafe --with-pthread
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 find doc/html -type f | xargs chmod -x
 %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
 find doc/html -name Dependencies -o -name Makefile\* | xargs rm
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
-# Don't instal h5perf until h5test.so.0 issues is sorted out
-rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
+
 
 %check
 make check
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt
@@ -104,7 +103,12 @@
 %{_libdir}/*.so
 %{_libdir}/*.mod
 
+
 %changelog
+* Wed Oct 17 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.6-1
+- Update to 1.6.6, drop upstreamed patches
+- Explicitly set compilers
+
 * Fri Aug 24 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.5-9
 - Update license tag to BSD
 - Rebuild for BuildID


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Dec 2005 21:07:16 -0000	1.3
+++ sources	17 Oct 2007 16:57:24 -0000	1.4
@@ -1 +1 @@
-67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz
+6c7fcc91f1579555d88bb10c6c9a33a9  hdf5-1.6.6.tar.gz


--- hdf5-1.6.4-gcc4.patch DELETED ---


--- hdf5-1.6.4-testh5repack.patch DELETED ---


--- hdf5-1.6.5-flags.patch DELETED ---


--- hdf5-1.6.5-h5diff_attr.patch DELETED ---


--- hdf5-1.6.5-memset.patch DELETED ---