rpms/octave-forge/devel octave-forge.spec,1.15,1.16

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge.spec 
Log Message:
Add new buildrequires to build with modular X and enable new features.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- octave-forge.spec	3 Feb 2006 17:21:39 -0000	1.15
+++ octave-forge.spec	3 Feb 2006 18:45:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.01.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -19,9 +19,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave >= 2.9.4 ImageMagick
-BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel
-BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel pcre-devel
-BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
+BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
+BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
+BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -38,6 +38,7 @@
 touch main/sparse/NOINSTALL
 
 %build
+export CPPFLAGS=-I%{_includedir}/netcdf-3
 %configure
 make %{?_smp_mflags}
 
@@ -68,6 +69,12 @@
 
 
 %changelog
+* Fri Feb  3 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-2
+- Add new build dependencies on ImageMagick-c++-devel and netcdf-devel.
+  (The ImageMagick-c++-devel indirectly brings in the necessary
+  modular X devel modules, such as libXt-devel and others).
+- Define CPPFLAGS so it finds the netcdf headers.
+
 * Fri Feb  3 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-1
 - New upstream release.
 - Patch so it will build correctly with octave 2.9.x.