Update to 3.2.0.

This commit is contained in:
Jussi Lehtola 2009-07-11 12:00:01 +00:00
parent 7426903e62
commit f6959e45ee
4 changed files with 48 additions and 42 deletions

View File

@ -1 +1 @@
octave-3.0.5.tar.bz2 octave-3.2.0.tar.bz2

View File

@ -1,2 +1,3 @@
octave-3_0_2-2_fc10:HEAD:octave-3.0.2-2.fc10.src.rpm:1224776342 octave-3_0_2-2_fc10:HEAD:octave-3.0.2-2.fc10.src.rpm:1224776342
octave-3_0_5-1_fc11:HEAD:octave-3.0.5-1.fc11.src.rpm:1239552316 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

View File

@ -1,30 +1,30 @@
# From src/version.h:#define OCTAVE_API_VERSION # From src/version.h:#define OCTAVE_API_VERSION
%define octave_api api-v32 %define octave_api api-v37
Name: octave Name: octave
Version: 3.0.5 Version: 3.2.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
Epoch: 6 Epoch: 6
Group: Applications/Engineering Group: Applications/Engineering
License: GPLv3+ License: GPLv3+
Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2 Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
#Patch1: %{name}-sh-arch.patch
#Patch2: %{name}-gcc44.patch
URL: http://www.octave.org URL: http://www.octave.org
Requires: gnuplot less info texinfo BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/install-info
Requires(postun): /sbin/ldconfig Provides: octave(api) = %{octave_api}
Requires(post): /sbin/ldconfig
Requires(preun): /sbin/install-info
BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel
BuildRequires: ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel BuildRequires: ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript
BuildRequires: curl-devel pcre-devel BuildRequires: curl-devel pcre-devel texinfo-tex arpack-devel
BuildRequires: suitesparse-devel glpk-devel gnuplot desktop-file-utils BuildRequires: suitesparse-devel glpk-devel gnuplot desktop-file-utils
Provides: octave(api) = %{octave_api} # FIXME: Uncomment when qrupdate is available in Fedora
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: qrupdate-devel
Requires: gnuplot less info texinfo
Requires(post): info
Requires(preun): info
%description %description
@ -63,16 +63,12 @@ then
exit 1 exit 1
fi fi
# patch for sh arch
#%patch1 -p1 -b .sh-arch
# patch for gcc 4.4
#%patch2 -p1 -b .gcc44
%build %build
%define enable64 no %global enable64 no
export CPPFLAGS="-DH5_USE_16_API" export CPPFLAGS="-DH5_USE_16_API"
%configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran %configure --enable-shared --disable-static --enable-64=%enable64 F77=gfortran
make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}" #make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}"
make OCTAVE_RELEASE="Fedora %{version}-%{release}"
%install %install
@ -120,33 +116,42 @@ if [ "$1" = "0" ]; then
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info || :
fi fi
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* %doc SENDING-PATCHES emacs/ examples/ doc/interpreter/octave.p*
%doc doc/faq doc/interpreter/HTML doc/refcard %doc doc/faq/ doc/interpreter/HTML/ doc/refcard/
%config /etc/ld.so.conf.d/octave-*.conf
%{_bindir}/octave* %{_bindir}/octave*
%config(noreplace) /etc/ld.so.conf.d/* %{_libdir}/octave-%{version}/
%{_libdir}/octave* %{_libexecdir}/octave/
%{_datadir}/octave %{_mandir}/man1/octave*.1.*
%ghost %{_datadir}/octave/octave_packages
%{_libexecdir}/octave
%{_mandir}/man*/octave*
%{_infodir}/octave.info* %{_infodir}/octave.info*
%{_datadir}/applications/* %{_datadir}/applications/fedora-octave.desktop
# octave_packages is %ghost, so need to list everything else separately
%dir %{_datadir}/octave
%{_datadir}/octave/%{version}/
%{_datadir}/octave/ls-R
%ghost %{_datadir}/octave/octave_packages
%{_datadir}/octave/packages/
%{_datadir}/octave/site/
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root,-)
%doc doc/liboctave %doc doc/liboctave/HTML/ doc/liboctave/liboctave.pdf
%{_bindir}/mkoctfile* %{_bindir}/mkoctfile
%{_includedir}/octave-%{version} %{_bindir}/mkoctfile-%{version}
%{_mandir}/man*/mkoctfile* %{_includedir}/octave-%{version}/
%{_mandir}/man1/mkoctfile.1.*
%changelog %changelog
* Sat Jul 11 2009 Jussi Lehtola <jussilehtola@fedoraproject.org> - 6:3.2.0-1
- Update to latest upstream (3.2.0).
* Sun Apr 12 2009 Rakesh Pandit <rakesh@fedoraproject.org> - 6:3.0.5-1 * Sun Apr 12 2009 Rakesh Pandit <rakesh@fedoraproject.org> - 6:3.0.5-1
- Updated to latest upstream (3.0.5) - Updated to latest upstream (3.0.5)
@ -634,7 +639,7 @@ does not exist.
- repackage in powertools. - repackage in powertools.
* Thu Jun 11 1998 Andrew Veliath <andrewtv@usa.net> * Thu Jun 11 1998 Andrew Veliath <andrewtv@usa.net>
- Add %attr, build as user. - Add %%attr, build as user.
* Mon Jun 1 1998 Andrew Veliath <andrewtv@usa.net> * Mon Jun 1 1998 Andrew Veliath <andrewtv@usa.net>
- Add BuildRoot, installinfo, require gnuplot, description from - Add BuildRoot, installinfo, require gnuplot, description from

View File

@ -1 +1 @@
bfba44eeda8fa6e29c2bbcd2604c34eb octave-3.0.5.tar.bz2 f7965847648233cd7ed866dd2db3bcdc octave-3.2.0.tar.bz2