Update to 6.2.0

This commit is contained in:
Orion Poplawski 2021-01-29 21:15:54 -07:00
parent f16d5f212d
commit 66154bafb2
3 changed files with 12 additions and 25 deletions

3
.gitignore vendored
View File

@ -34,3 +34,6 @@ octave-3.2.4.tar.bz2
/octave-5.1.0-docs.tar.lz /octave-5.1.0-docs.tar.lz
/octave-5.2.0.tar.lz /octave-5.2.0.tar.lz
/octave-5.2.0-docs.tar.lz /octave-5.2.0-docs.tar.lz
/octave-6.1.0.tar.lz
/octave-6.1.0-docs.tar.lz
/octave-6.2.0.tar.lz

View File

@ -1,12 +1,12 @@
# From src/version.h:#define OCTAVE_API_VERSION # From src/version.h:#define OCTAVE_API_VERSION
%global octave_api api-v53 %global octave_api api-v55
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
%global builddocs 1 %global builddocs 1
# Use Qt5 on Fedora and EL8+ # Use Qt5 on Fedora and EL7+
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 7
%bcond_without qt5 %bcond_without qt5
%else %else
%bcond_with qt5 %bcond_with qt5
@ -36,8 +36,8 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 5.2.0 Version: 6.2.0
Release: 14%{?dist} Release: 2%{?dist}
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
License: GPLv3+ License: GPLv3+
URL: http://www.octave.org URL: http://www.octave.org
@ -48,14 +48,6 @@ Source0: https://ftp.gnu.org/gnu/octave/octave-%{version}.tar.lz
Source1: macros.octave Source1: macros.octave
Source2: xorg.conf Source2: xorg.conf
# Prebuilt docs from Fedora for EPEL # Prebuilt docs from Fedora for EPEL
Source3: octave-5.2.0-docs.tar.lz
# SUNDIALS 3 support
# https://savannah.gnu.org/bugs/?52475
Patch1: octave-sundials3.patch
# Fix readline 8.1 bracketed-paste support
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=59483
# Backported patches
Patch2: octave-readline.patch
Provides: octave(api) = %{octave_api} Provides: octave(api) = %{octave_api}
Provides: bundled(gnulib) Provides: bundled(gnulib)
@ -225,13 +217,6 @@ This package contains documentation for Octave.
%if %{with blas64} %if %{with blas64}
sed -i -e 's/OCTAVE_CHECK_LIB(suitesparseconfig,/OCTAVE_CHECK_LIB(suitesparseconfig64,/' configure.ac sed -i -e 's/OCTAVE_CHECK_LIB(suitesparseconfig,/OCTAVE_CHECK_LIB(suitesparseconfig64,/' configure.ac
%endif %endif
# EPEL7's autoconf/automake is too old so don't do
# unneeded patches there
%if 0%{?fedora}
%patch1 -p1 -b .sundials3
%patch2 -p1 -b .readline
autoreconf -i
%endif
%build %build
export AR=%{_bindir}/gcc-ar export AR=%{_bindir}/gcc-ar
@ -295,9 +280,6 @@ cp -a doc/refcard/*.pdf %{buildroot}%{_pkgdocdir}/
# No info directory # No info directory
rm -f %{buildroot}%{_infodir}/dir rm -f %{buildroot}%{_infodir}/dir
# EL7's makeinfo doesn't support @sortas, so use prebuilt docs
%{?el7:tar xvf %SOURCE3 -C %{buildroot}}
# Make library links # Make library links
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/octave/%{version}%{?rctag}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/octave-%{_arch}.conf echo "%{_libdir}/octave/%{version}%{?rctag}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/octave-%{_arch}.conf
@ -444,6 +426,9 @@ make check %{?el7:|| :}
%{_pkgdocdir}/refcard*.pdf %{_pkgdocdir}/refcard*.pdf
%changelog %changelog
* Mon Aug 09 2021 Orion Poplawski <orion@nwra.com> - 6:6.2.0-1
- Update to 6.2.0
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6:5.2.0-14 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6:5.2.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1,2 +1 @@
SHA512 (octave-5.2.0.tar.lz) = e8f64c5703548e3f209aeaae51c3f6907db5189ec7790600be6f335d9edeb183d9dcfbf5ec711c5e30aa953877dd176a1c506ae90c505a52ed74dba6ce69c7f5 SHA512 (octave-6.2.0.tar.lz) = bcd5c018c6761fff76f1495b9a7bdac3fa71722233ee9230e682b16215d2c95302944b910a540fbc89215148b7037727561b4ef00f3b5a48da898dcbba2b76fe
SHA512 (octave-5.2.0-docs.tar.lz) = 6b1bf45446c7717153901ca0f39406c1b7dab6016012c51ccdce2f102f5ffae69262d3578a63adbc426910c31bbb7cee11221e5e224bb813630d829ed21b9ab6