Compare commits
6 Commits
master
...
EL-6-start
Author | SHA1 | Date | |
---|---|---|---|
|
515cc00d5f | ||
|
0fc90a137d | ||
|
9f621bf585 | ||
|
e25e7d3176 | ||
|
47113bb375 | ||
|
bd5c03dbdd |
@ -1 +1 @@
|
||||
octave-3.2.2.tar.bz2
|
||||
octave-3.2.3.tar.bz2
|
||||
|
2
Makefile
2
Makefile
@ -4,7 +4,7 @@ NAME := octave
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
@ -3,3 +3,4 @@ octave-3_0_5-1_fc11:HEAD:octave-3.0.5-1.fc11.src.rpm:1239552316
|
||||
octave-3_2_0-1_fc11:HEAD:octave-3.2.0-1.fc11.src.rpm:1247313567
|
||||
octave-3_2_2-1_fc11:HEAD:octave-3.2.2-1.fc11.src.rpm:1249027014
|
||||
octave-3_2_2-5_fc12:HEAD:octave-3.2.2-5.fc12.src.rpm:1253686658
|
||||
octave-3_2_3-1_fc13:F-12:octave-3.2.3-1.fc13.src.rpm:1255375629
|
||||
|
1
octave.conf
Normal file
1
octave.conf
Normal file
@ -0,0 +1 @@
|
||||
-b /usr/bin/octave-3.2.3
|
42
octave.spec
42
octave.spec
@ -1,20 +1,21 @@
|
||||
# From src/version.h:#define OCTAVE_API_VERSION
|
||||
%define octave_api api-v37
|
||||
%global octave_api api-v37
|
||||
|
||||
Name: octave
|
||||
Version: 3.2.2
|
||||
Release: 5%{?dist}
|
||||
Version: 3.2.3
|
||||
Release: 4%{?dist}
|
||||
Summary: A high-level language for numerical computations
|
||||
Epoch: 6
|
||||
Group: Applications/Engineering
|
||||
License: GPLv3+
|
||||
Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
|
||||
Source0: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
|
||||
Source1: octave.conf
|
||||
URL: http://www.octave.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Provides: octave(api) = %{octave_api}
|
||||
|
||||
BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel
|
||||
BuildRequires: bison flex less tetex gcc-gfortran atlas-devel
|
||||
BuildRequires: ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
|
||||
BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript
|
||||
BuildRequires: curl-devel pcre-devel texinfo-tex arpack-devel libX11-devel
|
||||
@ -46,7 +47,7 @@ Summary: Development headers and files for Octave
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: readline-devel fftw-devel hdf5-devel zlib-devel
|
||||
Requires: lapack-devel blas-devel gcc-c++ gcc-gfortran
|
||||
Requires: atlas-devel gcc-c++ gcc-gfortran
|
||||
|
||||
%description devel
|
||||
The octave-devel package contains files needed for developing
|
||||
@ -75,7 +76,12 @@ fi
|
||||
%build
|
||||
%global enable64 no
|
||||
export CPPFLAGS="-DH5_USE_16_API"
|
||||
%configure --enable-shared --disable-static --enable-64=%enable64 F77=gfortran
|
||||
export F77=gfortran
|
||||
%configure --enable-shared --disable-static --enable-64=%enable64 \
|
||||
--with-blas="-L%{_libdir}/atlas -lf77blas -latlas" --with-qrupdate \
|
||||
--with-lapack="-L%{_libdir}/atlas -llapack" \
|
||||
--with-amd --with-umfpack --with-colamd --with-ccolamd --with-cholmod \
|
||||
--with-cxsparse --with-arpack
|
||||
# SMP make doesn't work in Octave 3.2.2
|
||||
#make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}"
|
||||
make OCTAVE_RELEASE="Fedora %{version}-%{release}"
|
||||
@ -118,8 +124,12 @@ touch %{buildroot}%{_datadir}/%{name}/octave_packages
|
||||
mkdir interpreter
|
||||
cp -a doc/interpreter/*.pdf doc/interpreter/HTML/ interpreter/
|
||||
|
||||
#check
|
||||
#make check
|
||||
# work-around broken pre-linking (bug 524493)
|
||||
install -d %{buildroot}%{_sysconfdir}/prelink.conf.d
|
||||
install %{SOURCE1} %{buildroot}%{_sysconfdir}/prelink.conf.d/
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
@ -155,6 +165,7 @@ fi
|
||||
%ghost %{_datadir}/octave/octave_packages
|
||||
%{_datadir}/octave/packages/
|
||||
%{_datadir}/octave/site/
|
||||
%{_sysconfdir}/prelink.conf.d/octave.conf
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
@ -171,6 +182,19 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jan 17 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 6:3.2.3-4
|
||||
- Fix compilation against ARPACK.
|
||||
|
||||
* Wed Jan 6 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 6:3.2.3-3
|
||||
- Really build against ATLAS instead of reference BLAS (#513381).
|
||||
|
||||
* Sun Nov 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.3-2
|
||||
- Workaround broken pre-linking (#524493)
|
||||
|
||||
* Tue Sep 29 2009 Orion Poplawski <orion@cora.nwra.com> - 6:3.2.3-1
|
||||
- Update to 3.2.3
|
||||
- Re-add make check
|
||||
|
||||
* Tue Sep 22 2009 Rakesh Pandit <rakesh@fedoraproject.org> - 6:3.2.2-5
|
||||
- Added categories to desktop file: Education, DataVisualization, NumericalAnalysis
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user