From 6f237bc2ed416404e87f088e07592cc38b51844b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 26 2023 23:59:18 +0000 Subject: Disable building docs due to texinfo 7 incompatibility --- diff --git a/.gitignore b/.gitignore index e51c5fa..050dcab 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ octave-3.2.4.tar.bz2 /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 diff --git a/octave.spec b/octave.spec index d203854..0119d9d 100644 --- a/octave.spec +++ b/octave.spec @@ -3,7 +3,13 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) +%if 0%{?fedora} >= 38 +# Infinite loop with texinfo 7 +# https://savannah.gnu.org/bugs/index.php?63810 +%global builddocs 0 +%else %global builddocs 1 +%endif %if 0%{?fedora} %bcond_without flexiblas @@ -47,6 +53,9 @@ 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 # Add needed time.h header Patch2: octave-time.patch @@ -284,6 +293,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 @@ -452,6 +464,9 @@ make check %{_pkgdocdir}/refcard*.pdf %changelog +* Sun Feb 26 2023 Orion Poplawski - 6:7.3.0-3 +- Disable building docs due to texinfo 7 incompatibility + * Wed Jan 11 2023 FeRD (Frank Dana> - 6:7.3.0-3 - Build with rapidjson to enable built-in json{decode,encode} diff --git a/sources b/sources index 28a1449..d19d8b5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (octave-7.3.0.tar.lz) = 8448aa01fa2a0650993ff9e4a4a017c243d5bf4af17cc321458e583913f4a71c2a34d60c1f79b8fedd5f00604f0960b94a4e2c0d9b87f07b13e969afe2951aa2 +SHA512 (octave-7.3.0-docs.tar.xz) = a902b77117cf1c361b0d7c538ac4ed52140f073c1bddda5f10fe9d61c5a608a6be6b34cbab0e585a2deee04d09ed968a2d74b77d835bdadb445162143dcebc2b