Sync with upstream branch

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2025-01-10 09:21:22 +02:00
commit efb9187330
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3
3 changed files with 50 additions and 20 deletions

3
.gitignore vendored
View File

@ -47,3 +47,6 @@ octave-3.2.4.tar.bz2
/octave-8.2.0.tar.lz
/octave-8.3.0.tar.lz
/octave-8.4.0.tar.lz
/octave-9.1.0.tar.lz
/octave-9.2.0.tar.lz
/octave-9.3.0.tar.lz

View File

@ -1,5 +1,5 @@
# From src/version.h:#define OCTAVE_API_VERSION
%global octave_api api-v58
%global octave_api api-v59
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -36,10 +36,11 @@
Name: octave
Epoch: 6
Version: 8.4.0
Release: 2.1.riscv64%{?dist}
Version: 9.3.0
Release: 1%{?dist}
Summary: A high-level language for numerical computations
License: GPLv3+
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
URL: http://www.octave.org
Source0: https://ftp.gnu.org/gnu/octave/octave-%{version}.tar.lz
@ -118,12 +119,10 @@ BuildRequires: pcre2-devel
BuildRequires: portaudio-devel
BuildRequires: qhull-devel
BuildRequires: qrupdate-devel
# EPEL9 is missing qscintilla-qt5-devel - https://bugzilla.redhat.com/show_bug.cgi?id=2092182
%if 0%{?fedora} || 0%{?rhel} != 9
BuildRequires: qscintilla-qt5-devel
%endif
BuildRequires: qt5-linguist
BuildRequires: qt5-qttools-devel
BuildRequires: qscintilla-qt6-devel
BuildRequires: qt6-linguist
BuildRequires: qt6-qttools-devel
BuildRequires: pkgconfig(Qt6Core5Compat)
BuildRequires: rapidjson-devel
BuildRequires: readline-devel
%if %{with blas64}
@ -307,8 +306,8 @@ touch %{buildroot}%{_datadir}/%{name}/ls-R
desktop-file-validate %{buildroot}%{_datadir}/applications/org.octave.Octave.desktop
# RHEL7 still doesn't like the GNU project_group
%{?el7:sed -i -e /project_group/d %{buildroot}/%{_datadir}/metainfo/org.octave.Octave.appdata.xml}
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.octave.Octave.appdata.xml
%{?el7:sed -i -e /project_group/d %{buildroot}/%{_datadir}/metainfo/org.octave.Octave.metainfo.xml}
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.octave.Octave.metainfo.xml
# Create directories for add-on packages
HOST_TYPE=`%{buildroot}%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
@ -412,9 +411,9 @@ make check
%{_bindir}/octave*
%dir %{_libdir}/octave/
%dir %{_libdir}/octave/%{version}
%{_libdir}/octave/%{version}/liboctave.so.10*
%{_libdir}/octave/%{version}/liboctgui.so.9*
%{_libdir}/octave/%{version}/liboctinterp.so.11*
%{_libdir}/octave/%{version}/liboctave.so.11*
%{_libdir}/octave/%{version}/liboctgui.so.12*
%{_libdir}/octave/%{version}/liboctinterp.so.12*
%{_libdir}/octave/%{version}/mkoctfile-%{version}
%{_libdir}/octave/%{version}/oct/
%{_libdir}/octave/%{version}/octave-config-%{version}
@ -428,7 +427,7 @@ make check
%{_datadir}/applications/org.octave.Octave.desktop
%{_datadir}/icons/hicolor/*/apps/octave.png
%{_datadir}/icons/hicolor/scalable/apps/octave.svg
%{_datadir}/metainfo/org.octave.Octave.appdata.xml
%{_datadir}/metainfo/org.octave.Octave.metainfo.xml
# octave_packages is %ghost, so need to list everything else separately
%dir %{_datadir}/octave
%{_datadir}/octave/%{version}%{?rctag}/
@ -458,12 +457,40 @@ make check
%{_pkgdocdir}/refcard*.pdf
%changelog
* Mon Dec 18 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6:8.4.0-2.1.riscv64
- Rebuild for qhull
* Wed Jan 01 2025 Orion Poplawski <orion@nwra.com> - 6:9.3.0-1
- Update to 9.3.0
* Fri Dec 02 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6:8.4.0-2.0.riscv64
* Mon Nov 11 2024 Orion Poplawski <orion@nwra.com> - 6:9.2.0-1
- Update to 9.2.0
- Build with Qt6
* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 6:8.4.0-11
- Rebuild for hdf5 1.14.5
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 6:8.4.0-10
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6:8.4.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Mar 01 2024 Antonio Trande <sagitter@fedoraproject.org> - 6:8.4.0-8
- Rebuild for sundials-6.7.0
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 6:8.4.0-7
- Rebuilt for java-21-openjdk as system jdk
* Mon Feb 26 2024 David Abdurachmanov <davidlt@rivosinc.com> - 6:8.4.0-6
- Add support for riscv64
* Sun Feb 04 2024 Orion Poplawski <orion@nwra.com> - 6:8.4.0-5
- Rebuild with suitesparse 7.6.0
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6:8.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6:8.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Nov 20 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 6:8.4.0-2
- Rebuilt for sundials-6.6.2 (fix RHBZ#2249025)

View File

@ -1 +1 @@
SHA512 (octave-8.4.0.tar.lz) = 9687de436a1fdeed89061a3bae0749f506ae2c14eb444a0ca14eec80fbcbbc9cdc7a4ae6e90637d05a009f06650a1a11a4d65a2893d90450663dc7e2e9364acc
SHA512 (octave-9.3.0.tar.lz) = 09ff99c7af3da0680bcdc7732b8fc9c2e3936be43aad7c69638ed03b2e3d5db063c0e1e54fbae0a1ce378d4d80465dbc3c1f2b5831734466635c4fa4981d6f5f