rpms/GMT/EL-4 GMT.spec,1.7,1.8 GMT-4.3.1-octave.patch,1.1,NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/GMT/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23299

Modified Files:
	GMT.spec 
Removed Files:
	GMT-4.3.1-octave.patch 
Log Message:
Punt and remove octave support from EL-4


Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/EL-4/GMT.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GMT.spec	4 Jun 2008 21:21:38 -0000	1.7
+++ GMT.spec	4 Jun 2008 21:30:29 -0000	1.8
@@ -1,10 +1,6 @@
 %define gmthome %{_datadir}/GMT
 %define gmtconf %{_sysconfdir}/GMT
 
-%{!?octave_api: %define octave_api %(octave-config -p API_VERSION 2>/dev/null || echo 0)}
-%define octave_mdir %(octave-config -p LOCALAPIFCNFILEDIR || echo)
-%define octave_octdir %(octave-config -p LOCALAPIOCTFILEDIR || echo)
-
 Name:           GMT
 Version:        4.3.1
 Release:        2%{?dist}
@@ -17,13 +13,11 @@
 Source1:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_share.tar.bz2
 Source2:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_suppl.tar.bz2
 Source3:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_scripts.tar.bz2
-Patch0:         GMT-4.3.1-octave.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-devel
 BuildRequires:  netcdf-devel
 BuildRequires:  GMT-coastlines
-BuildRequires:  octave-devel
 BuildRequires:  ncurses
 # less is detected by configure, and substituted in GMT.in
 BuildRequires:  less
@@ -67,18 +61,6 @@
 applications that use %{name}.
 
 
-%package        octave
-Summary:        Octave libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       octave(api) = %{octave_api}
-Provides:       gmt-octave = %{version}-%{release}
-
-%description    octave
-The %{name}-octave package contains and Octave interface for developing
-applications that use %{name}.
-
-
 %package        examples
 Summary:        Generic Mapping Tools (Examples)
 Group:          Applications/Engineering
@@ -102,7 +84,6 @@
 
 %prep
 %setup -q -b1 -b2 -b3 -n GMT%{version}
-%patch -p1 -b .octave
 #We don't care about .bat files
 find -name \*.bat | xargs rm
 #Fix permissions
@@ -115,8 +96,6 @@
 export NETCDF_LIB="%{_libdir}/netcdf-3"
 %configure --datadir=%{gmthome} \
            --enable-shared \
-           --enable-octave --enable-mex-mdir=%{octave_mdir} \
-           --enable-mex-xdir=%{octave_octdir} \
            --disable-rpath --enable-www=%{_docdir}/%{name}-%{version}
 make
 make suppl
@@ -202,11 +181,6 @@
 %defattr(-,root,root,-)
 %{_libdir}/*.a
 
-%files octave
-%defattr(-,root,root,-)
-%{octave_mdir}/*.m
-%{octave_octdir}/*.oct
-
 %files examples
 %defattr(-,root,root,-)
 %doc %{gmthome}/examples


--- GMT-4.3.1-octave.patch DELETED ---