rpms/gdl/FC-4 gdl.spec,1.5,1.6

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/gdl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30011

Modified Files:
	gdl.spec 
Log Message:
- Enable hdf for ppc
- Add BR fftw-devel



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/FC-4/gdl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdl.spec	21 Nov 2005 18:29:05 -0000	1.5
+++ gdl.spec	24 Feb 2006 20:06:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.8.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -13,16 +13,7 @@
 BuildRequires:  gsl-devel, plplot-devel, ImageMagick-c++-devel
 BuildRequires:  netcdf-devel, hdf5-devel, libjpeg-devel
 BuildRequires:  python-devel, python-numarray, python-matplotlib
-%ifnarch ppc ppc64
-BuildRequires:  hdf-devel
-%define hdfconfig %{nil}
-%define hdfinclude "-I/usr/include/hdf"
-%define hdflib "-L%{_libdir}/hdf"
-%else
-%define hdfconfig "--with-hdf=no"
-%define hdfinclude %{nil}
-%define hdflib %{nil}
-%endif
+BuildRequires:  fftw-devel, hdf-devel
 
 
 %description
@@ -36,9 +27,9 @@
 
 
 %build
-%configure --disable-static %{hdfconfig} \
-           INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \
-           LIBS="-L%{_libdir}/netcdf-3 %{hdflib} -L/usr/X11R6/%{_lib}"
+%configure --disable-static --with-fftw --with-hdf \
+           INCLUDES="-I%{_includedir}/netcdf-3 -I%{_includedir}/hdf" \
+           LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf -L/usr/X11R6/%{_lib}"
 make %{?_smp_mflags}
 
 
@@ -58,6 +49,10 @@
 
 
 %changelog
+* Fri Feb 24 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-2
+- Enable hdf for ppc
+- Add BR fftw-devel
+
 * Mon Nov 21 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-1
 - Upstream 0.8.11
 - Remove hdf patch fixed upstream