From 89f5acb695f243af838f80f3cdf4d0bae81b286b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Wed, 6 Jan 2010 18:39:35 +0000
Subject: [PATCH] - Update to 1.8.4 - Must compile with -O0 due to gcc-4.4
 incompatability - No longer need -fno-strict-aliasing

---
 .cvsignore                      |  2 +-
 hdf5-1.8.3-snap12-tstlite.patch | 11 -----------
 hdf5-1.8.4-tstlite.patch        | 11 +++++++++++
 hdf5.spec                       | 17 +++++++++++------
 sources                         |  2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 hdf5-1.8.3-snap12-tstlite.patch
 create mode 100644 hdf5-1.8.4-tstlite.patch

diff --git a/.cvsignore b/.cvsignore
index d15e292..07e932d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hdf5-1.8.3-snap12.tar.gz
+hdf5-1.8.4.tar.bz2
diff --git a/hdf5-1.8.3-snap12-tstlite.patch b/hdf5-1.8.3-snap12-tstlite.patch
deleted file mode 100644
index 3422616..0000000
--- a/hdf5-1.8.3-snap12-tstlite.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf5-1.8.3-snap12/hl/fortran/test/Makefile.in.tstlite	2009-09-21 16:41:49.000000000 -0600
-+++ hdf5-1.8.3-snap12/hl/fortran/test/Makefile.in	2009-10-01 14:05:01.628777355 -0600
-@@ -355,7 +355,7 @@
- @FORTRAN_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static
- 
- # Our main target, the test programs
--TEST_PROG = tstlite tstimage tsttable
-+TEST_PROG = tstimage tsttable
- LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
- 
- # Source files for the programs
diff --git a/hdf5-1.8.4-tstlite.patch b/hdf5-1.8.4-tstlite.patch
new file mode 100644
index 0000000..38f0e93
--- /dev/null
+++ b/hdf5-1.8.4-tstlite.patch
@@ -0,0 +1,11 @@
+--- hdf5-1.8.4/hl/fortran/test/Makefile.in.tstlite	2009-11-10 14:12:08.000000000 -0700
++++ hdf5-1.8.4/hl/fortran/test/Makefile.in	2010-01-06 10:59:07.916197584 -0700
+@@ -364,7 +364,7 @@
+ 	f1tab.h5
+ 
+ # Our main target, the test programs
+-TEST_PROG = tstlite tstimage tsttable
++TEST_PROG = tstimage tsttable
+ LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
+ 
+ # Source files for the programs
diff --git a/hdf5.spec b/hdf5.spec
index 85fc2f3..a94c320 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -1,13 +1,13 @@
-%define snaprel -snap12
+%define snaprel %{nil}
 Name: hdf5
-Version: 1.8.3
-Release: 3.snap12%{?dist}
+Version: 1.8.4
+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
-Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-%{version}%{?snaprel}.tar.gz
+Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
 Source1: h5comp
 Patch1: hdf5-1.8.3-snap12-signal.patch
 Patch3: hdf5-1.8.0-multiarch.patch
@@ -15,7 +15,7 @@ Patch3: hdf5-1.8.0-multiarch.patch
 # string will be NULL terminated.  The tstlite test ends up crashing with
 # a stack smash.  Reported upstream 9/30/2009, but probably will take a bit
 # of work to fix.  This disables that test
-Patch4: hdf5-1.8.3-snap12-tstlite.patch
+Patch4: hdf5-1.8.4-tstlite.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -59,7 +59,7 @@ find -name '*.[ch]' -o -name '*.f90' -exec chmod -x {} +
 export CC=gcc
 export CXX=g++
 export F9X=gfortran
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="${RPM_OPT_FLAGS/O2/O0}"
 %configure \
   --disable-dependency-tracking \
   --enable-cxx \
@@ -164,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 6 2010 Orion Poplawski <orion@cora.nwra.com> 1.8.4-1
+- Update to 1.8.4
+- Must compile with -O0 due to gcc-4.4 incompatability
+- No longer need -fno-strict-aliasing
+
 * Thu Oct 1 2009 Orion Poplawski <orion@cora.nwra.com> 1.8.3-3.snap12
 - Update to 1.8.3-snap12
 - Update signal patch
diff --git a/sources b/sources
index fd52c2d..165e6ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ef4a3940a8952fe057a176b93e9b176  hdf5-1.8.3-snap12.tar.gz
+c13599cfff871948f4d00e19ac410b86  hdf5-1.8.4.tar.bz2