Update to 3.4.2.

This commit is contained in:
Jussi Lehtola 2011-08-06 10:44:15 +03:00
parent 6948e3e45a
commit 7d9020ec1b
3 changed files with 23 additions and 23 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
octave-3.2.4.tar.bz2
/octave-3.3.54.tar.bz2
/octave-3.4.0.tar.bz2
/octave-3.4.2.tar.bz2

View File

@ -1,17 +1,15 @@
# From src/version.h:#define OCTAVE_API_VERSION
%global octave_api api-v47+
%global octave_api api-v45+
Name: octave
Version: 3.4.0
Release: 4%{?dist}
Version: 3.4.2
Release: 1%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
License: GPLv3+
Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2
Source1: macros.octave
# Add missing cstddef for gcc 4.6
Patch0: octave-3.4.0-gcc46.patch
URL: http://www.octave.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -23,6 +21,7 @@ BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript
BuildRequires: curl-devel pcre-devel texinfo-tex arpack-devel libX11-devel
BuildRequires: suitesparse-devel glpk-devel gnuplot desktop-file-utils
BuildRequires: GraphicsMagick-c++-devel fltk-devel ftgl-devel qrupdate-devel
BuildRequires: %{_bindir}/dvips
Requires: gnuplot gnuplot-common less info texinfo
Requires(post): info
@ -68,13 +67,6 @@ This package contains documentation for Octave.
%prep
%setup -q
%patch0 -p1 -b .gcc46
# Check that octave_api is set correctly
if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
then
echo "octave_api variable in spec does not match src/version.h"
exit 1
fi
# Check permissions
find -name *.cc -exec chmod 644 {} \;
@ -90,7 +82,16 @@ export F77=gfortran
--with-lapack="-L%{_libdir}/atlas -llapack" \
--with-amd --with-umfpack --with-colamd --with-ccolamd --with-cholmod \
--with-cxsparse
make OCTAVE_RELEASE="Fedora %{version}-%{release}"
# Check that octave_api is set correctly (autogenerated file)
make -C src version.h
if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
then
echo "octave_api variable in spec does not match src/version.h"
exit 1
fi
make OCTAVE_RELEASE="Fedora %{version}-%{release}" %{?_smp_mflags}
%install
rm -rf %{buildroot}
@ -128,12 +129,8 @@ echo "-b %{_bindir}/octave-%{version}" > %{buildroot}%{_sysconfdir}/prelink.conf
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/rpm/
# TODO - Fix this:
# src/DLD-FUNCTIONS/md5sum.cc ............................*** stack smashing detected ***: /builddir/build/BUILD/octave-3.3.54/src/.libs/lt-octave terminated
#%check
#make check
%check
make check
%clean
rm -rf %{buildroot}
@ -152,13 +149,12 @@ fi
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog* COPYING NEWS* PROJECTS README README.Linux
%doc README.kpathsea
%doc AUTHORS BUGS ChangeLog COPYING NEWS README
# FIXME: Create an -emacs package that has the emacs addon
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf
%config(noreplace) %{_sysconfdir}/rpm/macros.octave
%{_bindir}/octave*
%{_libdir}/octave-%{version}/
%{_libdir}/octave/
%{_libexecdir}/octave/
%{_mandir}/man1/octave*.1.*
%{_infodir}/liboctave.info*
@ -189,6 +185,9 @@ fi
%changelog
* Sat Aug 06 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 6:3.4.2-1
- Update to 6.4.2.
* Wed Feb 23 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-4
- Update rpm macros per FPC comments

View File

@ -1 +1 @@
c8144cee1d37e645d3368a8e8a5f1856 octave-3.4.0.tar.bz2
31c744ab4555a2bf04d5e644b93f9b51 octave-3.4.2.tar.bz2