rpms/octave/devel octave.spec,1.17,1.18

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave.spec 
Log Message:
Add GLPK support (new build dependency and CPPFLAGS for configure.


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- octave.spec	8 Aug 2005 13:50:15 -0000	1.17
+++ octave.spec	9 Aug 2005 15:23:22 -0000	1.18
@@ -13,7 +13,7 @@
 BuildPrereq:    gnuplot bison flex less tetex gcc-gfortran lapack blas 
 BuildPrereq:    ncurses-devel zlib-devel libtermcap-devel hdf5-devel
 BuildPrereq:    readline-devel glibc-devel fftw3-devel autoconf gperf
-BuildPrereq:    umfpack-devel
+BuildPrereq:    umfpack-devel glpk-devel
 Prereq:         /sbin/ldconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       /etc/ld.so.conf.d
@@ -55,6 +55,7 @@
 %else
 %define enable64 --enable-64=no
 %endif
+CPPFLAGS=-I%{_includedir}/glpk \
 CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \
 	--enable-shared=yes --enable-lite-kernel --enable-static=no \
 	--prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir}
@@ -127,6 +128,7 @@
   old s390 workarounds, and LC_ALL setting. None of these appear to be
   necessary any longer, even if the platforms were supported.
 - Add --enable-64 to configure to enable 64-bit array indexing on x86_64.
+- Add support for GLPK (new build dependency and CPPFLAGS for configure).
 
 * Wed Jul 27 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.3-3
 - Add fftw3-devel to dependencies for devel