rpms/hdf5/EL-4 hdf5-1.6.4-ppc.patch, NONE, 1.1 hdf5-1.6.5-open.patch, 1.2, 1.3 hdf5-1.6.5-sort.patch, NONE, 1.1 hdf5-1.6.6-tail.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 hdf5.spec, 1.6, 1.7 sources, 1.5, 1.6 hdf5-1.6.4-gcc4.patch, 1.3, NONE hdf5-1.6.4-testh5repack.patch, 1.3, NONE hdf5-1.6.5-flags.patch, 1.3, NONE hdf5-1.6.5-h5diff_attr.patch, 1.3, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/hdf5/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8033

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.4-ppc.patch hdf5-1.6.5-open.patch 
	hdf5-1.6.5-sort.patch 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 
Log Message:
* Wed May 28 2008 Orion Poplawski <orion at cora.nwra.com> 1.6.7-1
- Update to 1.6.7


hdf5-1.6.4-ppc.patch:

--- NEW FILE hdf5-1.6.4-ppc.patch ---
--- hdf5-1.6.4/fortran/src/H5f90i.h.orig	2005-01-10 16:56:29.000000000 -0700
+++ hdf5-1.6.4/fortran/src/H5f90i.h	2005-11-18 11:06:58.000000000 -0700
@@ -102,6 +102,15 @@
 typedef int               size_t_f;
 #define FNAME_POST_UNDERSCORE
 
+/* PPC specific definitions */
+#elif defined __PPC__
+
+typedef long long         haddr_t_f;
+typedef long long         hsize_t_f;
+typedef long long         hssize_t_f;
+typedef int               size_t_f;
+#define FNAME_POST_UNDERSCORE
+
 /* IA64 specific definitions */
 #elif defined __ia64
 

hdf5-1.6.5-open.patch:

Index: hdf5-1.6.5-open.patch
===================================================================
RCS file: hdf5-1.6.5-open.patch
diff -N hdf5-1.6.5-open.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.5-open.patch	30 May 2008 21:02:52 -0000	1.3
@@ -0,0 +1,11 @@
+--- hdf5-1.6.5/perform/zip_perf.c.open	2007-08-08 14:55:09.000000000 -0600
++++ hdf5-1.6.5/perform/zip_perf.c	2007-08-08 14:55:25.000000000 -0600
+@@ -545,7 +545,7 @@
+         unlink(filename);
+ 
+         /* do compressed data write */
+-        output = open(filename, O_RDWR | O_CREAT);
++        output = open(filename, O_RDWR | O_CREAT, S_IRWXU);
+ 
+         if (output == -1)
+             error(strerror(errno));

hdf5-1.6.5-sort.patch:

--- NEW FILE hdf5-1.6.5-sort.patch ---
--- hdf5-1.6.5/bin/ltmain.sh.sort	2007-03-02 16:20:05.000000000 -0700
+++ hdf5-1.6.5/bin/ltmain.sh	2007-03-02 16:20:12.000000000 -0700
@@ -3329,7 +3329,7 @@
 	    fi
 
 	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+	    if grep -v "^: " < "$nlist" | sort -k 2 | uniq > "$nlist"S; then
 	      :
 	    else
 	      grep -v "^: " < "$nlist" > "$nlist"S

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/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 May 2008 21:59:27 -0000	1.5
+++ .cvsignore	30 May 2008 21:02:51 -0000	1.6
@@ -1 +1 @@
-hdf5-1.6.5.tar.gz
+hdf5-1.6.7.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-4/hdf5.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf5.spec	28 May 2008 21:59:27 -0000	1.6
+++ hdf5.spec	30 May 2008 21:02:52 -0000	1.7
@@ -1,18 +1,18 @@
 Name: hdf5
-Version: 1.6.5
-Release: 3%{?dist}
+Version: 1.6.7
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
-License: BSD-ish
+License: BSD
 Group: System Environment/Libraries
-URL: http://hdf.ncsa.uiuc.edu/HDF5/
-Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/%{name}-%{version}.tar.gz
-Patch0: hdf5-1.6.4-gcc4.patch
+URL: http://www.hdfgroup.org/HDF5/
+Source0: ftp://ftp.hdfgroup.org/HDF5/current16/src/%{name}-%{version}.tar.gz
 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
-Patch5: hdf5-1.6.5-flags.patch
-Patch6: hdf5-1.6.5-x86_64.patch
+Patch3: hdf5-1.6.6-tail.patch
+Patch5: hdf5-1.6.4-ppc.patch
+Patch7: hdf5-1.6.5-x86_64.patch
+Patch8: hdf5-1.6.5-sort.patch
+Patch10: hdf5-1.6.5-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, time
 
@@ -35,38 +35,44 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1 -b .flags
-%patch6 -p1 -b .x86_64
+%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
+%patch10 -p1 -b .open
+
 
 %build
-# the Fortran parts are hitting GCC bug 17917, add --enable-fortran when it gets fixed.
-%configure --with-ssl --enable-cxx --enable-threadsafe --with-pthread
+export CC=gcc
+export CXX=g++
+%configure --with-ssl --enable-cxx \
+           --enable-threadsafe --with-pthread
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 find doc/html -type f | xargs chmod -x
-find doc/html -name Dependencies | xargs rm
 %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
@@ -89,23 +95,71 @@
 %{_bindir}/h5c++
 %{_bindir}/h5cc
 %{_bindir}/h5redeploy
-%{_docdir}/%{name}/examples/
+%{_docdir}/%{name}/
 %{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
+
 %changelog
-* Wed Mar 15 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-3
+* Wed May 28 2008 Orion Poplawski <orion at cora.nwra.com> 1.6.7-1
+- Update to 1.6.7
+
+* 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
+
+* Wed Aug  8 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.5-8
+- Fix memset typo
+- Pass mode to open with O_CREAT
+
+* Mon Feb 12 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.5-7
+- New project URL
+- Add patch to use POSIX sort key option
+- Remove useless and multilib conflicting Makefiles from html docs
+  (bug #228365)
+- Make hdf5-devel own %{_docdir}/%{name}
+
+* Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-6
+- Rebuild for FC6
+
+* Wed Mar 15 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-5
 - Change rpath patch to not need autoconf
 - Add patch for libtool on x86_64
 - Fix shared lib permissions
 
-* Mon Mar 13 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-2
-- Add patch to avoid HDF setting the march compiler flag
+* Mon Mar 13 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-4
+- Add patch to avoid HDF setting the compiler flags
+
+* Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-3
+- Rebuild for gcc/glibc changes
 
-* Thu Mar 02 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-1
+* Wed Dec 21 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.5-2
+- Don't ship h5perf with missing library
+
+* Wed Dec 21 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.5-1
 - Update to 1.6.5
 
+* Wed Dec 21 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-9
+- Rebuild
+
+* Wed Nov 30 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-8
+- Package fortran files properly
+- Move compiler wrappers to devel
+
+* Fri Nov 18 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-7
+- Add patch for fortran compilation on ppc
+
+* Wed Nov 16 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-6
+- Bump for new openssl
+
+* Tue Sep 20 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-5
+- Enable fortran since the gcc bug is now fixed
+
 * Tue Jul 05 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-4
 - Make example scripts executable
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 May 2008 21:59:27 -0000	1.5
+++ sources	30 May 2008 21:02:52 -0000	1.6
@@ -1 +1 @@
-67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz
+79027c67188e2e4131c5573771f477ce  hdf5-1.6.7.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 ---