rpms/octave
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 2.9.16 and port various changes from devel branch.

Browse Source
This commit is contained in:
Quentin Spencer 2007-11-09 18:57:39 +00:00
parent e5c56d7a2f
commit 57bbeac767
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
octave-2.9.9.tar.bz2 octave-2.9.16.tar.bz2

30
octave.spec
View File

@ -1,14 +1,14 @@
# From src/version.h:#define OCTAVE_API_VERSION # From src/version.h:#define OCTAVE_API_VERSION
%define octave_api api-v22 %define octave_api api-v28
Name: octave Name: octave
Version: 2.9.9 Version: 2.9.16
Release: 2%{?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: GPL License: GPLv3+
Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
URL: http://www.octave.org URL: http://www.octave.org
Requires: gnuplot less info texinfo Requires: gnuplot less info texinfo
@ -17,7 +17,7 @@ Requires(postun): /sbin/ldconfig
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(preun): /sbin/install-info 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 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: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils
Provides: octave(api) = %{octave_api} Provides: octave(api) = %{octave_api}
@ -63,8 +63,7 @@ fi
%build %build
%define enable64 no %define enable64 no
export CPPFLAGS=-I%{_includedir}/glpk %configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran
%configure --enable-shared --disable-static --enable-64=%enable64
make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
@ -89,9 +88,15 @@ popd
# Create desktop file # Create desktop file
rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
desktop-file-install --vendor fedora --add-category X-Fedora \ desktop-file-install --vendor fedora --add-category X-Fedora --remove-category Development \
--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
# Create directories for add-on packages
HOST_TYPE=`$RPM_BUILD_ROOT%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
touch $RPM_BUILD_ROOT%{_datadir}/%{name}/octave_packages
%clean %clean
@ -119,6 +124,7 @@ fi
%config(noreplace) /etc/ld.so.conf.d/* %config(noreplace) /etc/ld.so.conf.d/*
%{_libdir}/octave* %{_libdir}/octave*
%{_datadir}/octave %{_datadir}/octave
%ghost %{_datadir}/octave/octave_packages
%{_libexecdir}/octave %{_libexecdir}/octave
%{_mandir}/man*/octave* %{_mandir}/man*/octave*
%{_infodir}/octave.info* %{_infodir}/octave.info*
@ -133,6 +139,14 @@ fi
%changelog %changelog
* Mon Nov 5 2007 Quentin Spencer <qspencer@users.sf.net> 2.9.16-1
- Update to version 2.9.16.
- Update licencse from GPLv2+ to GPLv3+.
- Add qhull-devel and texinfo as dependencies.
- Detection of glpk no longer needs special CPPFLAGS.
- Other changes from development branch, including new octave packages
directory and changes to desktop file install.
* Tue Feb 20 2007 Quentin Spencer <qspencer@users.sourceforge.net> 2.9.9-2 * Tue Feb 20 2007 Quentin Spencer <qspencer@users.sourceforge.net> 2.9.9-2
- Fix install-info bug (Bug 219404). - Fix install-info bug (Bug 219404).
- Add dependency on octave API so that breakages will be detected. (Bug 224050). - Add dependency on octave API so that breakages will be detected. (Bug 224050).

2
sources
View File

@ -1 +1 @@
a76a6d88f414285472896a63e4282b7f octave-2.9.9.tar.bz2 a7cbe4d897dd6f8d6d4aaff413a9c490 octave-2.9.16.tar.bz2