- killed subshell

- updated config patch: allow using -march=athlon, support for gcc 3.2,
  disabled static linking of tests (required libstdc++-static)
- release 3

Changed files:
    hdf5-config.patch -> 1.2
    hdf5.spec -> 1.13

diff --git a/hdf5-config.patch b/hdf5-config.patch
index 1b16c898bba81d9698d5efcfcd796b4d979becd2..41a22825a60b5b07c0c190accd581f18105fe939 100644 (file)
--- a/hdf5-config.patch
+++ b/hdf5-config.patch
@@ -5,7 +5,62 @@
  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) $(LT_STATIC_EXEC) -dlopen self -static -rpath $(bindir) $(DYNAMIC_DIRS)
 +LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir) $(DYNAMIC_DIRS)
- LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -static -rpath $(bindir) $(DYNAMIC_DIRS)
++LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
  LT_RUN=$(LT) --mode=execute
  LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+--- hdf5-1.4.4/config/gnu-flags.orig   Sat May 11 00:22:18 2002
++++ hdf5-1.4.4/config/gnu-flags        Sat Oct  5 15:25:14 2002
+@@ -75,42 +75,6 @@
+     sleep 5
+ fi
+ 
+-# Architecture-specific flags
+-case "$host_os-$host_cpu" in
+-    # FreeBSD sets the information from "hostname -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*)
+-        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*)
+-                # This check should be kept in sync with the *-i686 check below
+-                case "$cc_vendor-$cc_version" in
+-                    gcc-2.95*|gcc-3*)
+-                        ARCH=${ARCH:="-march=i686"}
+-                        ;;
+-                    gcc-*|egcs-*|pgcc-*)
+-                        ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro"}
+-                        ;;
+-                esac
+-            ;;
+-        esac
+-        ;;
+-
+-    *-i686)
+-        case "$cc_vendor-$cc_version" in
+-            gcc-2.9[56]*|gcc-3*)
+-                ARCH=${ARCH:="-march=i686"}
+-                ;;
+-            gcc-*|egcs-*|pgcc-*)
+-                ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro"}
+-                ;;
+-        esac
+-        ;;
+-esac
+-
+ # Host-specific flags
+ case "`hostname`" in
+     sleipnir.ncsa.uiuc.edu)
+@@ -144,7 +144,7 @@
+       cc_flags_set=yes
+       ;;
+ 
+-    gcc-3.1*)
++    gcc-3.[12]*)
+         # Replace -ansi flag with -std=c99 flag
+       CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+ 

diff --git a/hdf5.spec b/hdf5.spec
index 9c636155d30db830a87902a17d2aec5ad8f12708..aef9ce79ff438a771e8de86cbe5ab69bdce0383e 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -2,7 +2,7 @@ Summary:        Hierarchical Data Format 5 library
 Summary(pl):   Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
 Version:       1.4.4
-Release:       2
+Release:       3
 Group:         Libraries
 License:       Nearly BSD, but changed sources must be marked
 Source0:       ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/%{name}-%{version}/src/%{name}-%{version}.tar.gz
@@ -75,7 +75,10 @@ Narz
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-(cd c++ ; aclocal ; autoconf)
+cd c++
+%{__aclocal}
+%{__autoconf}
+cd ..
 %configure \
        --enable-cxx
 
@@ -109,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/html
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/*
 
 %files static