diff --git a/.cvsignore b/.cvsignore
index e69de29..e68f8a2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+hdf5-1.6.4.tar.gz
diff --git a/hdf5-1.6.4-destdir.patch b/hdf5-1.6.4-destdir.patch
new file mode 100644
index 0000000..2a8e03a
--- /dev/null
+++ b/hdf5-1.6.4-destdir.patch
@@ -0,0 +1,60 @@
+--- hdf5-1.6.4/config/commence.in.BAD	2005-04-03 13:52:00.000000000 -0500
++++ hdf5-1.6.4/config/commence.in	2005-04-03 13:52:53.000000000 -0500
+@@ -35,11 +35,11 @@
+ TRACE=:
+ 
+ ## Installation points
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-libdir=@libdir@
+-includedir=@includedir@
+-docdir=@exec_prefix@/doc
++prefix=$(DESTDIR)@prefix@
++exec_prefix=$(DESTDIR)@exec_prefix@
++bindir=$(DESTDIR)@bindir@
++libdir=$(DESTDIR)@libdir@
++includedir=$(DESTDIR)@includedir@
++docdir=$(DESTDIR)@exec_prefix@/doc
+ PUB_LIB=$(LIB)
+ 
+--- hdf5-1.6.4/fortran/config/commence.in.BAD	2005-04-03 14:08:27.000000000 -0500
++++ hdf5-1.6.4/fortran/config/commence.in	2005-04-03 14:08:48.000000000 -0500
+@@ -40,11 +40,11 @@
+ TRACE=:
+ 
+ ## Installation points
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-libdir=@libdir@
+-includedir=@includedir@
+-docdir=@exec_prefix@/doc
++prefix=$(DESTDIR)@prefix@
++exec_prefix=$(DESTDIR)@exec_prefix@
++bindir=$(DESTDIR)@bindir@
++libdir=$(DESTDIR)@libdir@
++includedir=$(DESTDIR)@includedir@
++docdir=$(DESTDIR)@exec_prefix@/doc
+ PUB_LIB=$(LIB)
+ 
+--- hdf5-1.6.4/c++/config/commence.in.BAD	2005-04-03 14:07:10.000000000 -0500
++++ hdf5-1.6.4/c++/config/commence.in	2005-04-03 14:07:35.000000000 -0500
+@@ -32,11 +32,11 @@
+ TRACE=:
+ 
+ ## Installation points
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-libdir=@libdir@
+-includedir=@includedir@
+-docdir=@exec_prefix@/doc
++prefix=$(DESTDIR)@prefix@
++exec_prefix=$(DESTDIR)@exec_prefix@
++bindir=$(DESTDIR)@bindir@
++libdir=$(DESTDIR)@libdir@
++includedir=$(DESTDIR)@includedir@
++docdir=$(DESTDIR)@exec_prefix@/doc
+ PUB_LIB=$(LIB)
+ 
diff --git a/hdf5-1.6.4-gcc4.patch b/hdf5-1.6.4-gcc4.patch
new file mode 100644
index 0000000..c9c2dc3
--- /dev/null
+++ b/hdf5-1.6.4-gcc4.patch
@@ -0,0 +1,15 @@
+--- hdf5-1.6.4/fortran/config/linux-gnulibc1.BAD	2005-04-03 12:55:55.000000000 -0500
++++ hdf5-1.6.4/fortran/config/linux-gnulibc1	2005-04-03 12:56:50.000000000 -0500
+@@ -25,7 +25,11 @@
+ # The default Fortran 90 compiler
+ if test "X-" = "X-$F9X"; then
+     case $CC_BASENAME in
+-        gcc*|pgcc*)
++        gcc*)
++            F9X=gfortran
++            F9X_BASENAME=gfortran    
++            ;;
++        pgcc*)
+             F9X=pgf90
+             F9X_BASENAME=pgf90
+             ;;
diff --git a/hdf5-1.6.4-h5diff_attr.patch b/hdf5-1.6.4-h5diff_attr.patch
new file mode 100644
index 0000000..0cdb6d4
--- /dev/null
+++ b/hdf5-1.6.4-h5diff_attr.patch
@@ -0,0 +1,81 @@
+--- hdf5-1.6.4/tools/lib/h5diff_attr.c.orig	2005-07-01 08:47:12.000000000 -0600
++++ hdf5-1.6.4/tools/lib/h5diff_attr.c	2005-07-01 09:01:59.000000000 -0600
+@@ -61,8 +61,8 @@
+  int        rank2;        /* rank of dataset */
+  hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
+  hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
+-	char       name1[255];
+- char       name2[255];
++	char       name1[255],np1[512];
++ char       name2[255],np2[512];
+ 	int        n1, n2, i, j;
+  int        ret=0;
+  hsize_t    nfound;
+@@ -191,21 +191,21 @@
+  * array compare
+  *-------------------------------------------------------------------------
+  */
+- sprintf(name1,"%s of <%s>",name1,path1);
+- sprintf(name2,"%s of <%s>",name2,path2);
++ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1);
++ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2);
+ 
+  /* always print name */
+  if (options->m_verbose)
+  {
+-  printf( "Attribute:   <%s> and <%s>\n",name1,name2); 
++  printf( "Attribute:   <%s> and <%s>\n",np1,np2); 
+   nfound = diff_array(buf1, 
+                      buf2,
+                      nelmts1,
+                      rank1,
+                      dims1,
+                      options,
+-                     name1,
+-                     name2,
++                     np1,
++                     np2,
+                      mtype1_id,
+                      attr1_id,
+                      attr2_id);
+@@ -225,8 +225,8 @@
+                      rank1,
+                      dims1,
+                      options,
+-                     name1,
+-                     name2,
++                     np1,
++                     np2,
+                      mtype1_id,
+                      attr1_id,
+                      attr2_id);
+@@ -234,15 +234,15 @@
+    options->m_quiet=0;
+    if (nfound) 
+    {
+-    printf( "Attribute:   <%s> and <%s>\n",name1,name2); 
++    printf( "Attribute:   <%s> and <%s>\n",np1,np2); 
+     nfound = diff_array(buf1, 
+                      buf2,
+                      nelmts1,
+                      rank1,
+                      dims1,
+                      options,
+-                     name1,
+-                     name2,
++                     np1,
++                     np2,
+                      mtype1_id,
+                      attr1_id,
+                      attr2_id);
+@@ -258,8 +258,8 @@
+                      rank1,
+                      dims1,
+                      options,
+-                     name1,
+-                     name2,
++                     np1,
++                     np2,
+                      mtype1_id,
+                      attr1_id,
+                      attr2_id);
diff --git a/hdf5-1.6.4-norpath.patch b/hdf5-1.6.4-norpath.patch
new file mode 100644
index 0000000..b40d038
--- /dev/null
+++ b/hdf5-1.6.4-norpath.patch
@@ -0,0 +1,46 @@
+--- hdf5-1.6.4/config/commence.in.BAD	2005-04-03 18:55:35.000000000 -0500
++++ hdf5-1.6.4/config/commence.in	2005-04-03 18:55:54.000000000 -0500
+@@ -48,8 +48,8 @@
+ DYNAMIC_DIRS=@DYNAMIC_DIRS@
+ LT=$(top_builddir)/libtool
+ LT_COMPILE=$(LT) --mode=compile $(CC)
+ LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS)
+-LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS)
++LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS)
+ LT_RUN=$(LT) --mode=execute
+ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+ LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+--- hdf5-1.6.4/aclocal.m4.BAD	2005-04-03 18:53:47.000000000 -0500
++++ hdf5-1.6.4/aclocal.m4	2005-04-03 18:54:13.000000000 -0500
+@@ -1383,7 +1383,7 @@
+ 
+   if test "$ld_shlibs" = yes; then
+     runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec=''
+     export_dynamic_flag_spec='${wl}--export-dynamic'
+     case $host_os in
+     cygwin* | mingw* | pw32*)
+--- hdf5-1.6.4/c++/config/commence.in.BAD	2005-04-03 18:55:05.000000000 -0500
++++ hdf5-1.6.4/c++/config/commence.in	2005-04-03 18:55:25.000000000 -0500
+@@ -50,8 +50,8 @@
+ DYNAMIC_DIRS=@DYNAMIC_DIRS@
+ LT=$(top_builddir)/libtool
+ LT_COMPILE=$(LT) --mode=compile $(CXX)
+ LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
+-LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
++LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS)
+ LT_RUN=$(LT) --mode=execute
+ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+ LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+--- hdf5-1.6.4/fortran/config/commence.in.BAD	2005-04-03 20:05:38.000000000 -0500
++++ hdf5-1.6.4/fortran/config/commence.in	2005-04-03 20:05:48.000000000 -0500
+@@ -54,7 +54,7 @@
+ LT=$(top_builddir)/libtool
+ LT_CCOMPILE=$(LT) --mode=compile $(CC)
+ LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir)
+-LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir)
++LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS)
+ LT_RUN=$(LT) --mode=execute
+ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+ LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
diff --git a/hdf5-1.6.4-testh5repack.patch b/hdf5-1.6.4-testh5repack.patch
new file mode 100644
index 0000000..c5426b7
--- /dev/null
+++ b/hdf5-1.6.4-testh5repack.patch
@@ -0,0 +1,11 @@
+--- hdf5-1.6.4/tools/h5repack/testh5repack_make.c.bad	2005-06-30 14:50:32.000000000 -0600
++++ hdf5-1.6.4/tools/h5repack/testh5repack_make.c	2005-06-30 14:45:48.000000000 -0600
+@@ -896,7 +896,7 @@
+  hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+  int      buf[DIM1][DIM2];
+  int      i, j, n;
+- char     name[5];
++ char     name[6];
+ 
+ 
+  for (i=n=0; i<DIM1; i++){
diff --git a/hdf5.spec b/hdf5.spec
new file mode 100644
index 0000000..45b4b77
--- /dev/null
+++ b/hdf5.spec
@@ -0,0 +1,109 @@
+Name: hdf5
+Version: 1.6.4
+Release: 4%{?dist}
+Summary: A general purpose library and file format for storing scientific data
+License: BSD-ish
+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
+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.4-h5diff_attr.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: krb5-devel, openssl-devel, zlib-devel
+
+%description
+HDF5 is a general purpose library and file format for storing scientific data.
+HDF5 can store two primary objects: datasets and groups. A dataset is 
+essentially a multidimensional array of data elements, and a group is a 
+structure for organizing objects in an HDF5 file. Using these two basic 
+objects, one can create and store almost any kind of scientific data 
+structure, such as images, arrays of vectors, and structured and unstructured 
+grids. You can also mix and match them in HDF5 files according to your needs.
+
+%package devel
+Summary: HDF5 development files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+HDF5 development headers and libraries.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%build
+autoconf
+# the Fortran parts are hitting GCC bug 17917, add --enable-fortran when it gets fixed.
+%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 '*.sh*' | xargs chmod +x
+%makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
+
+%check
+make check
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,0755)
+%doc COPYING MANIFEST README.txt release_docs/RELEASE.txt
+%doc release_docs/HISTORY.txt doc/html
+%{_bindir}/gif2h5
+%{_bindir}/h52gif
+%{_bindir}/h5c++
+%{_bindir}/h5cc
+%{_bindir}/h5debug
+%{_bindir}/h5diff
+%{_bindir}/h5dump
+%{_bindir}/h5import
+%{_bindir}/h5jam
+%{_bindir}/h5ls
+%{_bindir}/h5redeploy
+%{_bindir}/h5repack
+%{_bindir}/h5repart
+%{_bindir}/h5unjam
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,0755)
+%{_docdir}/%{name}/examples/c++
+%{_docdir}/%{name}/examples/c
+%{_includedir}/*.h
+%{_libdir}/*.a
+%{_libdir}/*.so
+
+%changelog
+* Tue Jul 05 2005 Orion Poplawski <orion@cora.nwra.com> 1.6.4-4
+- Make example scripts executable
+
+* Wed Jul 01 2005 Orion Poplawski <orion@cora.nwra.com> 1.6.4-3
+- Add --enable-threads --with-pthreads to configure
+- Add %check
+- Add some %docs
+- Use %makeinstall
+- Add patch to fix test for h5repack
+- Add patch to fix h5diff_attr.c
+
+* Mon Jun 27 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.6.4-2
+- remove szip from spec, since szip license doesn't meet Fedora standards
+
+* Sun Apr 3 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.6.4-1
+- inital package for Fedora Extras
diff --git a/sources b/sources
index e69de29..975ad51 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a837391b633fc4c6681905d89047c032  hdf5-1.6.4.tar.gz