Compare commits
5 Commits
4612d8c128
...
36ac824c44
Author | SHA1 | Date | |
---|---|---|---|
|
36ac824c44 | ||
|
6f237bc2ed | ||
|
73d4b70c55 | ||
|
93e5fb4a81 | ||
|
797a124cb4 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -41,3 +41,5 @@ octave-3.2.4.tar.bz2
|
||||
/octave-6.4.0.tar.lz
|
||||
/octave-7.1.0.tar.lz
|
||||
/octave-7.2.0.tar.lz
|
||||
/octave-7.3.0.tar.lz
|
||||
/octave-7.3.0-docs.tar.xz
|
||||
|
43
ab6d276f6fcb
Normal file
43
ab6d276f6fcb
Normal file
@ -0,0 +1,43 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Rik <rik@octave.org>
|
||||
# Date 1668451079 28800
|
||||
# Node ID ab6d276f6fcb90631131eeb6668efd4f54a36204
|
||||
# Parent 662499ba0d21173006f99fc3b14b9a76a0e8670a
|
||||
build: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648).
|
||||
|
||||
* doc/interpreter/mk-qthelp.pl: Update regular expressions that find the start
|
||||
of data in index.html and Function-index.html to include additional pattern
|
||||
generated by Texinfo 7.0.
|
||||
|
||||
diff --git a/doc/interpreter/mk-qthelp.pl b/doc/interpreter/mk-qthelp.pl
|
||||
--- a/doc/interpreter/mk-qthelp.pl
|
||||
+++ b/doc/interpreter/mk-qthelp.pl
|
||||
@@ -26,8 +26,11 @@
|
||||
open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
|
||||
|
||||
# Skip through preamble of file to find start of list
|
||||
-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
|
||||
-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
|
||||
+while (defined ($_ = <$HTML>) and ! /^<div class="contents">/ ) {;}
|
||||
+while (defined ($_ = <$HTML>)
|
||||
+ and ! /^<ul class="(?:no-bullet|toc-numbered-mark)">/ ) {;}
|
||||
+
|
||||
+die "index.html: reached EOF without finding data start pattern" if eof ($HTML);
|
||||
|
||||
$level = 0;
|
||||
while (<$HTML>)
|
||||
@@ -68,7 +71,11 @@
|
||||
open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
|
||||
|
||||
# Skip through preamble of file to find start of list
|
||||
-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
|
||||
+while (defined ($_ = <$HTML>)
|
||||
+ and ! /^<table class="(?:index-fn|fn-entries)/ ) {;}
|
||||
+
|
||||
+die "Function-Index.html: reached EOF without finding data start pattern"
|
||||
+ if eof ($HTML);
|
||||
|
||||
while (<$HTML>)
|
||||
{
|
||||
|
29
octave.spec
29
octave.spec
@ -36,8 +36,8 @@
|
||||
|
||||
Name: octave
|
||||
Epoch: 6
|
||||
Version: 7.2.0
|
||||
Release: 2%{?dist}
|
||||
Version: 7.3.0
|
||||
Release: 4%{?dist}
|
||||
Summary: A high-level language for numerical computations
|
||||
License: GPLv3+
|
||||
URL: http://www.octave.org
|
||||
@ -47,6 +47,12 @@ Source0: https://ftp.gnu.org/gnu/octave/octave-%{version}.tar.lz
|
||||
# RPM macros for helping to build Octave packages
|
||||
Source1: macros.octave
|
||||
Source2: xorg.conf
|
||||
%if !%{builddocs}
|
||||
Source3: octave-%{version}-docs.tar.xz
|
||||
%endif
|
||||
# Infinite loop with texinfo 7
|
||||
# https://savannah.gnu.org/bugs/index.php?63810
|
||||
Patch0: https://hg.savannah.gnu.org/hgweb/octave/raw-rev/ab6d276f6fcb
|
||||
# Add needed time.h header
|
||||
Patch2: octave-time.patch
|
||||
|
||||
@ -121,6 +127,7 @@ BuildRequires: qscintilla-qt5-devel
|
||||
%endif
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: rapidjson-devel
|
||||
BuildRequires: readline-devel
|
||||
%if %{with blas64}
|
||||
BuildRequires: suitesparse64-devel
|
||||
@ -283,6 +290,9 @@ make install-data install-html install-info install-pdf DESTDIR=%{buildroot}
|
||||
mkdir -p %{buildroot}%{_pkgdocdir}
|
||||
cp -ar AUTHORS BUGS ChangeLog examples NEWS README %{buildroot}%{_pkgdocdir}/
|
||||
cp -a doc/refcard/*.pdf %{buildroot}%{_pkgdocdir}/
|
||||
%if !%{builddocs}
|
||||
tar xvf %SOURCE3 -C %{buildroot}
|
||||
%endif
|
||||
|
||||
find %{buildroot}%{_libdir} -name \*.la -delete
|
||||
|
||||
@ -451,6 +461,21 @@ make check
|
||||
%{_pkgdocdir}/refcard*.pdf
|
||||
|
||||
%changelog
|
||||
* Fri Mar 17 2023 Orion Poplawski <orion@nwra.com> - 6:7.3.0-4
|
||||
- Add upstream patch to fix doc builds
|
||||
|
||||
* Sun Feb 26 2023 Orion Poplawski <orion@nwra.com> - 6:7.3.0-3
|
||||
- Disable building docs due to texinfo 7 incompatibility
|
||||
|
||||
* Fri Feb 10 2023 FeRD (Frank Dana> <ferdnyc@gmail.com> - 6:7.3.0-3
|
||||
- Build with rapidjson to enable built-in json{decode,encode}
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6:7.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Nov 04 2022 Orion Poplawski <orion@nwra.com> - 6:7.3.0-1
|
||||
- Update to 7.3.0
|
||||
|
||||
* Sun Oct 02 2022 Orion Poplawski <orion@nwra.com> - 6:7.2.0-2
|
||||
- Disable qscintilla and sundials support on EPEL9 for now (bz#2122390)
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (octave-7.2.0.tar.lz) = 15189bfb28f9df74949d292cd712e8bd0ade72a8a5148f29bc386039cad3cbb0c1e55b5212bceb3c9285fd5a1a2663185ff7c80e8435ff14665469df58d76c0e
|
||||
SHA512 (octave-7.3.0.tar.lz) = 8448aa01fa2a0650993ff9e4a4a017c243d5bf4af17cc321458e583913f4a71c2a34d60c1f79b8fedd5f00604f0960b94a4e2c0d9b87f07b13e969afe2951aa2
|
||||
|
Loading…
Reference in New Issue
Block a user