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

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Mon Aug 8 13:50:18 UTC 2005


Author: qspencer

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

Modified Files:
	octave.spec 
Log Message:
Cleanup of spec file to remove old cruft that doesn't appear to be
needed any more. Most of the things being removed have been in the
file for years and are workarounds for old problems that don't exist
any longer. Enabled support for 64-bit extensions on x86_64 (to
allow large arrays that exceed the capabilities of 32-bit indexing).



Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- octave.spec	3 Aug 2005 15:36:37 -0000	1.16
+++ octave.spec	8 Aug 2005 13:50:15 -0000	1.17
@@ -1,8 +1,6 @@
-%define __libtoolize /bin/true
-
 Name:           octave
 Version:        2.9.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -19,7 +17,6 @@
 Prereq:         /sbin/ldconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       /etc/ld.so.conf.d
-ExcludeArch:    ppc64 s390x
 
 %description
 GNU Octave is a high-level language, primarily intended for numerical
@@ -52,16 +49,13 @@
 ./autogen.sh
 
 
-%ifarch s390
-(cd readline && libtoolize --copy --force)
-(cd glob && libtoolize --copy --force)
-(cd kpathsea && libtoolize --copy --force)
-%endif
-
 %build
-LC_ALL=POSIX
-export LC_ALL
-CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure \
+%ifarch x86_64
+%define enable64 --enable-64=yes
+%else
+%define enable64 --enable-64=no
+%endif
+CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \
 	--enable-shared=yes --enable-lite-kernel --enable-static=no \
 	--prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir}
 make %{?_smp_mflags}
@@ -128,6 +122,12 @@
 
 
 %changelog
+* Mon Aug 08 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.3-4
+- Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms,
+  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.
+
 * Wed Jul 27 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.3-3
 - Add fftw3-devel to dependencies for devel
 




More information about the fedora-extras-commits mailing list