rpms/octave/devel octave-2.9.4-x86_64.patch, NONE, 1.1 octave.spec, 1.24, 1.25

Thu Dec 1 14:45:04 UTC 2005

Author: qspencer

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

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.4-x86_64.patch 
Log Message:
Add x86_64 patch.

octave-2.9.4-x86_64.patch:

--- NEW FILE octave-2.9.4-x86_64.patch ---
--- octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc.orig	2005-11-11 10:44:05.000000000 -0700
+++ octave-2.9.4/src/DLD-FUNCTIONS/spchol.cc	2005-11-30 15:41:35.000000000 -0700
@@ -609,7 +609,11 @@
 	  for (octave_idx_type k = 0 ; k < n ; k++)
 	    {
 	      // get the kth row of L and store in the columns of L
+#ifdef IDX_TYPE_LONG
+	      cholmod_l_row_subtree (A1, A2, k, Parent, R, cm) ;
+#else
 	      cholmod_row_subtree (A1, A2, k, Parent, R, cm) ;
+#endif
 	      for (octave_idx_type p = 0 ; p < Rp [1] ; p++)
 		L.xridx (W [Ri [p]]++) = k ;
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- octave.spec	12 Nov 2005 06:02:28 -0000	1.24
+++ octave.spec	1 Dec 2005 14:45:02 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -8,6 +8,7 @@
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.4-header.patch
+Patch1:         octave-2.9.4-x86_64.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 ./autogen.sh
 
 
@@ -63,7 +65,8 @@
 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}
+	--prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} \
+	--mandir=%{_mandir}
 make %{?_smp_mflags}
 
 
@@ -72,7 +75,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f doc/interpreter/munge-texi doc/interpreter/*.o
 strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct
 
@@ -82,7 +85,6 @@
 
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/%{version}/oct/*/PKG_ADD
 
 
 # XXX Nuke unpackaged files
@@ -129,6 +131,9 @@
 
 
 %changelog
+* Thu Dec  1 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-2
+- Patch to enable compilation on x86_64.
+
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-1
 - New upstream release.
 - Patch to make sure all headers are included in -devel.


