[gdl/el6: 5/6] Merge branch 'master' into el6

[Orion Poplawski]

commit 32f767b1d6dfcf656d10000eefc4da3b0867a77a
Merge: 3e2f98e 19303c6
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Jan 7 14:52:49 2012 -0700

    Merge branch 'master' into el6

 gdl.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc gdl.spec
index 49406fa,b8a5448..a224909
--- a/gdl.spec
+++ b/gdl.spec
@@@ -35,11 -35,10 +35,12 @@@ BuildRequires:  gsl-devel, plplot-devel
  BuildRequires:  netcdf-devel, hdf5-devel, libjpeg-devel
  BuildRequires:  python-devel, numpy, python-matplotlib
  BuildRequires:  fftw-devel, hdf-static
 +%if 0%{?fedora} || 0%{?rhel} >= 6
  BuildRequires:  grib_api-static
 +%endif
  #TODO - Build with mpi support
  #BuildRequires:  mpich2-devel
+ BuildRequires:  pslib-devel
  BuildRequires:  udunits2-devel
  BuildRequires:  wxGTK-devel
  BuildRequires:  autoconf, automake, libtool