From e743be254ae03ef9783fb7e48ec5919ee292f2e5 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Tue, 27 May 2008 17:43:39 +0000
Subject: [PATCH] - Update to 1.8.1-rc1

---
 .cvsignore            |  2 +-
 hdf5-1.6.6-free.patch | 19 -------------------
 hdf5.spec             | 16 +++++++++-------
 sources               |  2 +-
 4 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 hdf5-1.6.6-free.patch

diff --git a/.cvsignore b/.cvsignore
index 852e2ce..58a4ecd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hdf5-1.8.0-snap5.tar.bz2
+hdf5-1.8.1-rc1.tar.gz
diff --git a/hdf5-1.6.6-free.patch b/hdf5-1.6.6-free.patch
deleted file mode 100644
index 6e44cb2..0000000
--- a/hdf5-1.6.6-free.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- hdf5-1.6.6/c++/src/H5PropList.cpp.free	2007-08-16 10:12:26.000000000 -0600
-+++ hdf5-1.6.6/c++/src/H5PropList.cpp	2008-02-05 15:14:51.000000000 -0700
-@@ -24,6 +24,7 @@
- #include "H5Exception.h"
- #include "H5IdComponent.h"
- #include "H5PropList.h"
-+#include "H5private.h"
- 
- #ifndef H5_NO_NAMESPACE
- namespace H5 {
-@@ -425,7 +426,7 @@
-    if (temp_str != NULL)
-    {
-       H5std_string class_name = H5std_string(temp_str);
--      free(temp_str);
-+      HDfree(temp_str);
-       return(class_name);
-    }
-    else
diff --git a/hdf5.spec b/hdf5.spec
index dc63c42..a0eab68 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -1,12 +1,12 @@
 Name: hdf5
-Version: 1.8.0.snap5
-Release: 2%{?dist}
+Version: 1.8.1
+Release: 0.rc1.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-1.8.0-snap5.tar.bz2
+Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-1.8.1-rc1.tar.gz
 Source1: h5comp
 Patch1: hdf5-1.8.0-signal.patch
 Patch2: hdf5-1.8.0-destdir.patch
@@ -14,7 +14,6 @@ Patch3: hdf5-1.8.0-multiarch.patch
 Patch4: hdf5-1.8.0-scaleoffset.patch
 Patch5: hdf5-1.8.0-longdouble.patch
 Patch10: hdf5-1.6.5-open.patch
-Patch13: hdf5-1.6.6-free.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -47,7 +46,7 @@ HDF5 static libraries.
 
 
 %prep
-%setup -q -n %{name}-1.8.0-snap5
+%setup -q -n %{name}-1.8.1-rc1
 %patch1 -p1 -b .signal
 %patch2 -p1 -b .destdir
 %patch3 -p1 -b .multiarch
@@ -56,7 +55,6 @@ HDF5 static libraries.
 %patch5 -p1 -b .longdouble
 %endif
 %patch10 -p1 -b .open
-%patch13 -p1 -b .free
 
 
 %build
@@ -127,7 +125,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc release_docs/HISTORY*.txt
 %{_bindir}/gif2h5
 %{_bindir}/h52gif
-%{_bindir}/h52gifgentst
 %{_bindir}/h5copy
 %{_bindir}/h5debug
 %{_bindir}/h5diff
@@ -136,6 +133,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/h5jam
 %{_bindir}/h5ls
 %{_bindir}/h5mkgrp
+%{_bindir}/h5perf
+%{_bindir}/h5perf_serial
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5stat
@@ -161,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 27 2008 Orion Poplawski <orion@cora.nwra.com> 1.8.1-0.rc1.1
+- Update to 1.8.1-rc1
+
 * Tue May 13 2008 Orion Poplawski <orion@cora.nwra.com> 1.8.0.snap5-2
 - Use new %%{_fmoddir} macro
 - Re-enable ppc64, disable failing tests.  Failing tests are for 
diff --git a/sources b/sources
index 9a30cdf..8f9ffc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e355b7a05f787748124cbd7f5eea859d  hdf5-1.8.0-snap5.tar.bz2
+f56b639d2c3e279599aff5b8bbd8e9fe  hdf5-1.8.1-rc1.tar.gz