rpms/hdf5/devel hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.8,1.9

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4855

Modified Files:
	hdf5.spec 
Added Files:
	hdf5-1.6.5-flags.patch 
Log Message:
Add patch to avoid HDF setting the compiler flags


hdf5-1.6.5-flags.patch:

--- NEW FILE hdf5-1.6.5-flags.patch ---
--- hdf5-1.6.5/config/linux-gnulibc1.orig	2005-10-28 14:15:27.000000000 -0600
+++ hdf5-1.6.5/config/linux-gnulibc1	2006-03-13 09:49:37.000000000 -0700
@@ -25,14 +25,5 @@
    CC_BASENAME=gcc
 fi
 
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out Intel C compiler flags
-. $srcdir/config/intel-flags
-
 # Check MPICH settings
 . $srcdir/config/mpich
--- hdf5-1.6.5/fortran/config/linux-gnulibc1.orig	2006-03-13 09:39:23.000000000 -0700
+++ hdf5-1.6.5/fortran/config/linux-gnulibc1	2006-03-13 09:47:18.000000000 -0700
@@ -25,16 +25,6 @@
     CC_BASENAME=gcc
 fi
 
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out Intel C compiler flags
-. $srcdir/config/intel-flags
-
-
 # The default Fortran 90 compiler
 if test "X-" = "X-$F9X"; then
     case $CC_BASENAME in


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hdf5.spec	13 Feb 2006 18:50:15 -0000	1.8
+++ hdf5.spec	13 Mar 2006 16:54:44 -0000	1.9
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@
 Patch3: hdf5-1.6.4-testh5repack.patch
 Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
+Patch6: hdf5-1.6.5-flags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -40,6 +41,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1 -b .flags
 
 %build
 autoconf
@@ -96,6 +98,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* 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