rpms/gdl/devel gdl.spec,1.1,1.2

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	gdl.spec 
Log Message:
Don't include hdf support on ppc



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdl.spec	22 Sep 2005 16:49:35 -0000	1.1
+++ gdl.spec	22 Sep 2005 17:21:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.8.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -12,9 +12,17 @@
 
 BuildRequires:  readline-devel, ncurses-devel
 BuildRequires:  gsl-devel, plplot-devel, ImageMagick-c++-devel
-BuildRequires:  netcdf-devel, hdf5-devel, hdf-devel, libjpeg-devel
+BuildRequires:  netcdf-devel, hdf5-devel, libjpeg-devel
 BuildRequires:  python-devel, python-numarray, python-matplotlib
-#Requires:       
+%ifnarch ppc ppc64
+BuildRequires:  hdf-devel
+%define hdfinclude "-I/usr/include/hdf"
+%define hdflib "-L%{_libdir}/hdf"
+%else
+%define hdfinclude %{nil}
+%define hdflib %{nil}
+%endif
+
 
 %description
 A free IDL (Interactive Data Language) compatible incremental compiler
@@ -29,8 +37,8 @@
 
 %build
 %configure --disable-static \
-           INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \
-           LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf -L/usr/X11R6/%{_lib}"
+           INCLUDES="-I/usr/include/netcdf-3 %{hdfinclude}" \
+           LIBS="-L%{_libdir}/netcdf-3 %{hdflib} -L/usr/X11R6/%{_lib}"
 make %{?_smp_mflags}
 
 
@@ -50,5 +58,8 @@
 
 
 %changelog
+* Thu Sep 22 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.8.10-2
+- Don't include hdf support on ppc
+
 * Fri Aug 19 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.8.10-1
 - Initial Fedora Extras version