From eaf38ac3597016fc5ba1c4c5886bb7c73af41bc9 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Aug 04 2022 09:41:14 +0000 Subject: Fixed #2113876, Failed to build LaTex output --- diff --git a/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch b/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch new file mode 100644 index 0000000..99fde06 --- /dev/null +++ b/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch @@ -0,0 +1,19 @@ +commit 6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4 +Author: František Dvořák +Date: Mon Jul 25 21:40:19 2022 +0200 + + Fix typo in generated Makefile for LaTex + +diff --git a/src/latexgen.cpp b/src/latexgen.cpp +index d3ad3bd3..c5f436ce 100644 +--- a/src/latexgen.cpp ++++ b/src/latexgen.cpp +@@ -337,7 +337,7 @@ static void writeLatexMakefile() + } + t << "\techo \"Rerunning latex....\"\n" + << "\t$(LATEX_CMD) $(MANUAL_FILE).tex\n" +- << "\tlatex_count=%(LATEX_COUNT) ; \\\n" ++ << "\tlatex_count=$(LATEX_COUNT) ; \\\n" + << "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n" + << "\t do \\\n" + << "\t echo \"Rerunning latex....\" ;\\\n" diff --git a/doxygen.spec b/doxygen.spec index 781c4b8..004aa17 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -9,7 +9,7 @@ %global stable 1 %if 0%{?stable} -%global irelease 1 +%global irelease 2 %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -21,8 +21,14 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 Version: 1.9.4 -Release: %{irelease}%{?dist}.1 - +%if 0%{?stable} +Release: 2%{?dist} +%else +%global commit e18f715eb55121a4219d00bc4d824cebf1fb504b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global date 20220217 +Release: 0.%{date}git%{shortcommit} +%endif # No version is specified. License: GPL+ Url: https://github.com/doxygen @@ -37,6 +43,7 @@ Source1: doxywizard.desktop Source2: doxywizard-icons.tar.xz # upstream patches Patch0: doxygen-1.9.4-gcc12.1.patch +Patch1: doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -314,6 +321,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Aug 04 2022 Than Ngo - 2:1.9.4-2 +- Fixed #2113876, Failed to build LaTex output + * Thu Jul 21 2022 Fedora Release Engineering - 2:1.9.4-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild