diff --git a/doxygen-obsolete-egrep.patch b/doxygen-obsolete-egrep.patch new file mode 100644 index 0000000..9a859b5 --- /dev/null +++ b/doxygen-obsolete-egrep.patch @@ -0,0 +1,40 @@ +--- doxygen-1.9.6.orig/templates/latex/latexmakefile.tpl 2023-03-09 10:29:08.772377871 +0100 ++++ doxygen-1.9.6/templates/latex/latexmakefile.tpl 2023-03-09 10:29:23.754555476 +0100 +@@ -9,7 +9,7 @@ + {# TODO: generateBib #} + pdflatex refman + latex_count=8 ; \ +- while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\ ++ while grep -E -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\ + do \ + echo "Rerunning latex...." ;\ + pdflatex refman ;\ +@@ -43,7 +43,7 @@ + echo "Rerunning latex...." + {{ config.LATEX_CMD_NAME }} refman.tex + latex_count=8 ; \ +- while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\ ++ while grep -E -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\ + do \ + echo "Rerunning latex...." ;\ + {{ config.LATEX_CMD_NAME }} refman.tex ;\ +--- doxygen-1.9.6.orig/src/latexgen.cpp 2023-03-09 11:10:52.092688592 +0100 ++++ doxygen-1.9.6/src/latexgen.cpp 2023-03-09 11:11:07.666867516 +0100 +@@ -346,7 +346,7 @@ + t << "\techo \"Rerunning latex....\"\n" + << "\t$(LATEX_CMD) $(MANUAL_FILE).tex\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" ++ << "\twhile grep -E -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" + << "\t $(LATEX_CMD) $(MANUAL_FILE).tex ; \\\n" +@@ -374,7 +374,7 @@ + } + t << "\t$(LATEX_CMD) $(MANUAL_FILE)\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" ++ << "\twhile grep -E -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" + << "\t $(LATEX_CMD) $(MANUAL_FILE) ;\\\n" diff --git a/doxygen.spec b/doxygen.spec index c101895..6009311 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 6%{?dist} +Release: 7%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -42,6 +42,7 @@ Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz # upstream patches +Patch0: doxygen-obsolete-egrep.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -320,6 +321,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri Mar 10 2023 Than Ngo - 2:1.9.6-7 +- replace obsolescent egrep with grep -E + * Fri Feb 17 2023 Than Ngo - 2:1.9.6-6 - migrated to SPDX license