- added config patch (allow -march=athlon, gcc3 support)

- added missing lib*.so link to -devel
- release 2

Changed files:
    h4h5tools-config.patch -> 1.1
    h4h5tools.spec -> 1.2

diff --git a/h4h5tools-config.patch b/h4h5tools-config.patch
new file mode 100644 (file)
index 0000000..4c1041a
--- /dev/null
+++ b/h4h5tools-config.patch
@@ -0,0 +1,54 @@
+--- h4h5tools/config/gnu-flags.orig    Tue Mar 19 20:44:35 2002
++++ h4h5tools/config/gnu-flags Sat Oct  5 15:54:04 2002
+@@ -76,42 +76,6 @@
+ 
+ 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*)
+-                        ARCH=${ARCH:="-march=i686 -malign-double"}
+-                        ;;
+-                    gcc-*|egcs-*|pgcc-*)
+-                        ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro -malign-double"}
+-                        ;;
+-                esac
+-            ;;
+-        esac
+-        ;;
+-
+-    *-i686)
+-        case "$cc_vendor-$cc_version" in
+-            gcc-2.9[56]*)
+-                ARCH=${ARCH:="-march=i686 -malign-double"}
+-                ;;
+-            gcc-*|egcs-*|pgcc-*)
+-                ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro -malign-double"}
+-                ;;
+-        esac
+-        ;;
+-esac
+-
+ # Host-specific flags
+ case "`hostname`" in
+     hawkwind.ncsa.uiuc.edu)
+@@ -160,7 +124,7 @@
+       cc_flags_set=yes
+       ;;
+ 
+-    gcc-2.95.[3456789])
++    gcc-2.95.[3456789]|gcc-3*)
+         # Start using the C99 Standard's extensions (long long, etc.)
+         # (Not quite yet... -QAK)
+         # General

diff --git a/h4h5tools.spec b/h4h5tools.spec
index 9fc1b5e6ca7bc303dcd6d3aeee83075e75364a30..40bceb5e608799d231df05e558b4f70884e2ad7c 100644 (file)
--- a/h4h5tools.spec
+++ b/h4h5tools.spec
@@ -2,11 +2,12 @@ Summary:      HDF 4.x to/from HDF5 conversion tools
 Summary(pl):   Narzêdzia do konwersji pomiêdzy HDF 4.x i HDF5
 Name:          h4h5tools
 Version:       1.0
-Release:       1
+Release:       2
 Group:         Applications/File
 License:       Nearly BSD, but changed sources must be marked
 Source0:       ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/h4toh5/src/%{name}.tar.gz
 Source1:       http://hdf.ncsa.uiuc.edu/h4toh5/h4toh5lib_UG.pdf
+Patch0:                %{name}-config.patch
 URL:           http://hdf.ncsa.uiuc.edu/h4toh5/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -69,6 +70,7 @@ oraz z HDF5 do HDF 4.x.
 
 %prep
 %setup -q -n %{name}
+%patch -p1
 install %{SOURCE1} .
 
 %build
@@ -110,7 +112,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc h4toh5lib_UG.pdf
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/*
 
 %files static