Wed May 28 22:00:18 UTC 2008

Author: orion

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

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.4-destdir.patch hdf5-1.6.4-gcc4.patch 
	hdf5-1.6.4-norpath.patch hdf5-1.6.4-testh5repack.patch 
	hdf5-1.6.5-flags.patch hdf5-1.6.5-h5diff_attr.patch 
	hdf5-1.6.5-x86_64.patch 
Removed Files:
	branch h5comp hdf5-1.6.5-open.patch hdf5-1.8.0-destdir.patch 
	hdf5-1.8.0-longdouble.patch hdf5-1.8.0-multiarch.patch 
	hdf5-1.8.0-scaleoffset.patch hdf5-1.8.0-signal.patch 
Log Message:
Revert 1.8.1 update

hdf5-1.6.4-destdir.patch:

Index: hdf5-1.6.4-destdir.patch
===================================================================
RCS file: hdf5-1.6.4-destdir.patch
diff -N hdf5-1.6.4-destdir.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.4-destdir.patch	28 May 2008 21:59:27 -0000	1.3
@@ -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)
+ 

hdf5-1.6.4-gcc4.patch:

Index: hdf5-1.6.4-gcc4.patch
===================================================================
RCS file: hdf5-1.6.4-gcc4.patch
diff -N hdf5-1.6.4-gcc4.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.4-gcc4.patch	28 May 2008 21:59:27 -0000	1.3
@@ -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
+             ;;

hdf5-1.6.4-norpath.patch:

Index: hdf5-1.6.4-norpath.patch
===================================================================
RCS file: hdf5-1.6.4-norpath.patch
diff -N hdf5-1.6.4-norpath.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.4-norpath.patch	28 May 2008 21:59:27 -0000	1.4
@@ -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/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)
+--- hdf5-1.6.4/configure.norpath	2006-03-15 14:12:46.000000000 -0700
++++ hdf5-1.6.4/configure	2006-03-15 14:14:09.000000000 -0700
+@@ -5569,7 +5569,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-testh5repack.patch:

Index: hdf5-1.6.4-testh5repack.patch
===================================================================
RCS file: hdf5-1.6.4-testh5repack.patch
diff -N hdf5-1.6.4-testh5repack.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.4-testh5repack.patch	28 May 2008 21:59:27 -0000	1.3
@@ -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++){

hdf5-1.6.5-flags.patch:

Index: hdf5-1.6.5-flags.patch
===================================================================
RCS file: hdf5-1.6.5-flags.patch
diff -N hdf5-1.6.5-flags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.5-flags.patch	28 May 2008 21:59:27 -0000	1.3
@@ -0,0 +1,56 @@
+--- hdf5-1.6.5/config/gnu-flags.orig	2005-10-28 14:15:26.000000000 -0600
++++ hdf5-1.6.5/config/gnu-flags	2006-03-13 10:59:58.000000000 -0700
+@@ -107,25 +107,6 @@
+   gcc*|egcs*|pgcc*)
+     # Architecture-specific flags
+     arch=
+-    case "$host_os-$host_cpu" in
+-        # FreeBSD sets the information from "uname -m" to the general machine
+-        # architecture, not the specific CPU for the machine, so even our
+-        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+-        # machine, use the "sysctl" command to get the CPU hardware model.
+-        freebsd*-i386)
+-            host_cpu_model=`sysctl -n hw.model`
+-            case "$host_cpu_model" in
+-                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+-                *Pro*|*II*|*III*|*IV*|*Athlon*)
+-                    arch="-march=i686"
+-                ;;
+-            esac
+-            ;;
+-
+-        *-i686)
+-            arch="-march=i686"
+-            ;;
+-    esac
+ 
+     # Host-specific flags
+     case "`hostname`" in
+--- hdf5-1.6.5/fortran/config/gnu-flags.orig	2005-10-28 14:57:02.000000000 -0600
++++ hdf5-1.6.5/fortran/config/gnu-flags	2006-03-13 10:59:22.000000000 -0700
+@@ -107,25 +107,6 @@
+   gcc*|egcs*|pgcc*)
+     # Architecture-specific flags
+     arch=
+-    case "$host_os-$host_cpu" in
+-        # FreeBSD sets the information from "uname -m" to the general machine
+-        # architecture, not the specific CPU for the machine, so even our
+-        # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+-        # machine, use the "sysctl" command to get the CPU hardware model.
+-        freebsd*-i386)
+-            host_cpu_model=`sysctl -n hw.model`
+-            case "$host_cpu_model" in
+-                # Hmm.. this might not catch Celerons, but it won't hurt them either...
+-                *Pro*|*II*|*III*|*IV*|*Athlon*)
+-                    arch="-march=i686"
+-                ;;
+-            esac
+-            ;;
+-
+-        *-i686)
+-            arch="-march=i686"
+-            ;;
+-    esac
+ 
+     # Host-specific flags
+     case "`hostname`" in

hdf5-1.6.5-h5diff_attr.patch:

Index: hdf5-1.6.5-h5diff_attr.patch
===================================================================
RCS file: hdf5-1.6.5-h5diff_attr.patch
diff -N hdf5-1.6.5-h5diff_attr.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.5-h5diff_attr.patch	28 May 2008 21:59:27 -0000	1.3
@@ -0,0 +1,81 @@
+--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig	2005-12-21 12:08:45.000000000 -0700
++++ hdf5-1.6.5/tools/lib/h5diff_attr.c	2005-12-21 12:11:17.000000000 -0700
+@@ -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;
+@@ -196,21 +196,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);
+@@ -230,8 +230,8 @@
+                      rank1,
+                      dims1,
+                      options,
+-                     name1,
+-                     name2,
++                     np1,
++                     np2,
+                      mtype1_id,
+                      attr1_id,
+                      attr2_id);
+@@ -239,15 +239,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);
+@@ -263,8 +263,8 @@
+                      rank1,
+                      dims1,
+                      options,
+-                     name1,
+-                     name2,
++                     np1,
++                     np2,
+                      mtype1_id,
+                      attr1_id,
+                      attr2_id);

hdf5-1.6.5-x86_64.patch:

Index: hdf5-1.6.5-x86_64.patch
===================================================================
RCS file: hdf5-1.6.5-x86_64.patch
diff -N hdf5-1.6.5-x86_64.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.6.5-x86_64.patch	28 May 2008 21:59:27 -0000	1.3
@@ -0,0 +1,13 @@
+--- hdf5-1.6.5/configure.norpath	2006-03-15 14:12:46.000000000 -0700
++++ hdf5-1.6.5/configure	2006-03-15 14:14:09.000000000 -0700
+@@ -6097,8 +6097,8 @@
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
+ 
+ case $host_os in
+ aix3*)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 May 2008 20:30:38 -0000	1.4
+++ .cvsignore	28 May 2008 21:59:27 -0000	1.5
@@ -1 +1 @@
-hdf5-1.8.1-rc1.tar.gz
+hdf5-1.6.5.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-4/hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hdf5.spec	28 May 2008 20:30:38 -0000	1.5
+++ hdf5.spec	28 May 2008 21:59:27 -0000	1.6
@@ -1,28 +1,20 @@
 Name: hdf5
-Version: 1.8.1
-Release: 1.rc1.1%{?dist}
+Version: 1.6.5
+Release: 3%{?dist}
 Summary: A general purpose library and file format for storing scientific data
-License: BSD
+License: BSD-ish
 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.1-rc1.tar.gz
-Source1: h5comp
-Patch1: hdf5-1.8.0-signal.patch
-Patch2: hdf5-1.8.0-destdir.patch
-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
+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.5-h5diff_attr.patch
+Patch5: hdf5-1.6.5-flags.patch
+Patch6: hdf5-1.6.5-x86_64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, time
-%if "%{?dist}" != ".el4"
-BuildRequires: gcc-gfortran
-%endif
-
-%if "%{?dist}" == ".el5"
-%define _fmoddir %{_libdir}/gfortran/modules/
-%endif
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.
@@ -33,7 +25,6 @@
 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
@@ -42,252 +33,79 @@
 %description devel
 HDF5 development headers and libraries.
 
-
-%package static
-Summary: HDF5 static libraries
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-HDF5 static libraries.
-
-
 %prep
-%setup -q -n %{name}-1.8.1-rc1
-%patch1 -p1 -b .signal
-%patch2 -p1 -b .destdir
-%patch3 -p1 -b .multiarch
-%patch4 -p1 -b .scaleoffset
-%ifarch ppc64
-%patch5 -p1 -b .longdouble
-%endif
-%patch10 -p1 -b .open
-
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1 -b .flags
+%patch6 -p1 -b .x86_64
 
 %build
-export CC=gcc
-export CXX=g++
-%if "%{?dist}" != ".el4"
-export F9X=gfortran
-%endif
-# Must turn of production mode to preserve -g during compile
-%configure --enable-production=no --enable-debug=no \
-           --enable-cxx  \
-%if "%{?dist}" != ".el4"
-           --enable-fortran \
-%endif
-           --with-ssl
-
-#Multiarch header
-%ifarch x86_64 ppc64 ia64 s390
-cp src/H5pubconf.h \
-   src/H5pubconf-64.h
-%else
-cp src/H5pubconf.h \
-   src/H5pubconf-32.h
-%endif
+# 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
-make install DESTDIR=${RPM_BUILD_ROOT}
+find doc/html -type f | xargs chmod -x
+find doc/html -name Dependencies | xargs rm
+%makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
-#Fortran modules
-%if "%{?dist}" != ".el4"
-mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
-mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod ${RPM_BUILD_ROOT}%{_fmoddir}
-%endif
-
-#Fixup headers and scripts for multiarch
-%ifarch x86_64 ppc64 ia64 s390
-mv ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf.h \
-   ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf-64.h
-for x in h5c++ h5cc
-do
-  mv ${RPM_BUILD_ROOT}%{_bindir}/${x} \
-     ${RPM_BUILD_ROOT}%{_bindir}/${x}-64
-  install -m 0755 %SOURCE1 ${RPM_BUILD_ROOT}%{_bindir}/${x}
-done
-%if "%{?dist}" != ".el4"
-  mv ${RPM_BUILD_ROOT}%{_bindir}/h5fc \
-     ${RPM_BUILD_ROOT}%{_bindir}/h5fc-64
-  install -m 0755 %SOURCE1 ${RPM_BUILD_ROOT}%{_bindir}/h5fc
-%endif
-%else
-mv ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf.h \
-   ${RPM_BUILD_ROOT}%{_includedir}/H5pubconf-32.h
-for x in h5c++ h5cc
-do
-  mv ${RPM_BUILD_ROOT}%{_bindir}/${x} \
-     ${RPM_BUILD_ROOT}%{_bindir}/${x}-32
-  install -m 0755 %SOURCE1 ${RPM_BUILD_ROOT}%{_bindir}/${x}
-done
-%if "%{?dist}" != ".el4"
-  mv ${RPM_BUILD_ROOT}%{_bindir}/h5fc \
-     ${RPM_BUILD_ROOT}%{_bindir}/h5fc-32
-  install -m 0755 %SOURCE1 ${RPM_BUILD_ROOT}%{_bindir}/h5fc
-%endif
-%endif
-
+# Don't instal h5perf until h5test.so.0 issues is sorted out
+rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
 
 %check
-make check || true
-
+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
-%doc release_docs/HISTORY*.txt
+%doc release_docs/HISTORY.txt doc/html
 %{_bindir}/gif2h5
 %{_bindir}/h52gif
-%{_bindir}/h5copy
 %{_bindir}/h5debug
 %{_bindir}/h5diff
 %{_bindir}/h5dump
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
-%{_bindir}/h5mkgrp
-%{_bindir}/h5perf
-%{_bindir}/h5perf_serial
 %{_bindir}/h5repack
 %{_bindir}/h5repart
-%{_bindir}/h5stat
 %{_bindir}/h5unjam
-%{_libdir}/*.so.*
+%attr(0755,root,root) %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/h5c++
-%{_bindir}/h5c++-*
 %{_bindir}/h5cc
-%{_bindir}/h5cc-*
 %{_bindir}/h5redeploy
+%{_docdir}/%{name}/examples/
 %{_includedir}/*.h
-%{_libdir}/*.so
-%if "%{?dist}" != ".el4"
-%{_bindir}/h5fc
-%{_bindir}/h5fc-*
-%{_fmoddir}/*.mod
-%endif
-
-%files static
-%defattr(-,root,root,-)
 %{_libdir}/*.a
-
+%{_libdir}/*.so
 
 %changelog
-* Wed May 28 2008 Balint Cristian <rezso at rdsor.ro> 1.8.1-1.rc1.1
-- require gcc-g77 for fortran on RHEL4
-- return true for check section
-
-* Tue May 27 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.1-0.rc1.1
-- Update to 1.8.1-rc1
-
-* Tue May 13 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0.snap5-2
-- Use new %%{_fmoddir} macro
-- Re-enable ppc64, disable failing tests.  Failing tests are for 
-  experimental long double support.
-
-* Mon May 5 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0.snap5-1
-- Update to 1.8.0-snap5
-- Remove --enable-threadsafe, incompatible with --enable-cxx and 
-  --enable-fortran
-- ExcludeArch ppc64 until we can get it to build (bug #445423)
-
-* Tue Mar 4 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0-2
-- Remove failing test for now
-
-* Fri Feb 29 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0-1
-- Update to 1.8.0, drop upstreamed patches
-- Update signal patch
-- Move static libraries into -static sub-package
-- Make -devel multiarch (bug #341501)
-
-* Wed Feb  6 2008 Orion Poplawski <orion at cora.nwra.com> 1.6.6-7
-- Add patch to fix strict-aliasing
-- Disable production mode to enable debuginfo
-
-* Tue Feb  5 2008 Orion Poplawski <orion at cora.nwra.com> 1.6.6-6
-- Add patch to fix calling free() in H5PropList.cpp
-
-* Tue Feb  5 2008 Orion Poplawski <orion at cora.nwra.com> 1.6.6-5
-- Add patch to support s390 (bug #431510)
-
-* Mon Jan  7 2008 Orion Poplawski <orion at cora.nwra.com> 1.6.6-4
-- Add patches to support sparc (bug #427651)
-
-* Tue Dec  4 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.6-3
-- Rebuild against new openssl
-
-* Fri Nov 23 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.6-2
-- Add patch to build on alpha (bug #396391)
-
-* 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
+* Wed Mar 15 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-3
 - 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-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
+* 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
 
-* 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
+* Thu Mar 02 2006 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 May 2008 20:30:38 -0000	1.4
+++ sources	28 May 2008 21:59:27 -0000	1.5
@@ -1 +1 @@
-f56b639d2c3e279599aff5b8bbd8e9fe  hdf5-1.8.1-rc1.tar.gz
+67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz


--- branch DELETED ---


--- h5comp DELETED ---


--- hdf5-1.6.5-open.patch DELETED ---


--- hdf5-1.8.0-destdir.patch DELETED ---


--- hdf5-1.8.0-longdouble.patch DELETED ---


--- hdf5-1.8.0-multiarch.patch DELETED ---


--- hdf5-1.8.0-scaleoffset.patch DELETED ---


--- hdf5-1.8.0-signal.patch DELETED ---


