rpms/GMT/EL-4 GMT-4.3.1-octave.patch,NONE,1.1 GMT.spec,1.6,1.7
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Jun 4 21:22:31 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/GMT/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22725
Modified Files:
GMT.spec
Added Files:
GMT-4.3.1-octave.patch
Log Message:
Try to support old octave in EL-4
GMT-4.3.1-octave.patch:
--- NEW FILE GMT-4.3.1-octave.patch ---
--- GMT4.3.1/configure.octave 2008-05-15 17:47:07.000000000 -0600
+++ GMT4.3.1/configure 2008-06-04 15:14:39.000000000 -0600
@@ -10991,8 +10991,8 @@
else
{ $as_echo "$as_me:$LINENO: checking Compiler options for Octave" >&5
$as_echo_n "checking Compiler options for Octave... " >&6; }
- MEX_BLD='mkoctfile --mex -DGMT_OCTAVE'
- MEX_EXT='mex'
+ MEX_BLD='mkoctfile -DGMT_OCTAVE'
+ MEX_EXT='oct'
MEX_LIB=
MEX_INC=
if test "X$enable_mex_mdir" = "X" || test "X$enable_mdir" = "Xyes" ; then
Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/EL-4/GMT.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GMT.spec 4 Jun 2008 20:16:06 -0000 1.6
+++ GMT.spec 4 Jun 2008 21:21:38 -0000 1.7
@@ -17,6 +17,7 @@
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
@@ -101,6 +102,7 @@
%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
@@ -203,7 +205,7 @@
%files octave
%defattr(-,root,root,-)
%{octave_mdir}/*.m
-%{octave_octdir}/*.mex
+%{octave_octdir}/*.oct
%files examples
%defattr(-,root,root,-)
More information about the scm-commits
mailing list