replace obsolescent egrep with grep -E

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -57,3 +57,5 @@ doxygen-1.7.1.src.tar.gz
 /doxygen-1.9.2-d882240f-git.src.tar.gz
 /doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz
 /doxygen-1.9.4.src.tar.gz
+/doxygen-1.9.5.src.tar.gz
+/doxygen-1.9.6.src.tar.gz

doxygen-1.9.4-gcc12.1.patch

@@ -1,18 +0,0 @@
-commit 5198966c8d5fec89116d025c74934ac03ea511fa
-Author: Dimitri van Heesch <doxygen@gmail.com>
-Date:   Fri May 6 09:55:16 2022 +0200
-
-    issue #9312: Build: cache.h:53:14: error: 'exchange' is not a member of 'std'
-
-diff --git a/src/cache.h b/src/cache.h
-index 0ff3092e..e218eb27 100644
---- a/src/cache.h
-+++ b/src/cache.h
-@@ -19,6 +19,7 @@
- #include <list>
- #include <unordered_map>
- #include <mutex>
-+#include <utility>
- #include <ctype.h>
- 
- /*! Fixed size cache for value type V using keys of type K.

doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch

@@ -1,19 +0,0 @@
-commit 6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4
-Author: František Dvořák <valtri@civ.zcu.cz>
-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"

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"

doxygen.spec

@@ -20,17 +20,17 @@
 Summary: A documentation system for C/C++
 Name:    doxygen
 Epoch:   2
-Version: 1.9.4
+Version: 1.9.6
 %if 0%{?stable}
-Release: 2%{?dist}
+Release: 7%{?dist}
 %else
 %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global date 20220217
-Release: 0.%{date}git%{shortcommit}
+Release: 0.%{date}git%{shortcommit}.1
 %endif
 # No version is specified.
-License: GPL+
+License: GPL-1.0-or-later
 Url: https://github.com/doxygen
 %if 0%{?stable}
 Source0: https://sourceforge.net/projects/doxygen/files/rel-%{version}/%{name}-%{version}.src.tar.gz
@@ -42,12 +42,13 @@ Source1: doxywizard.desktop
 # these icons are part of doxygen and converted from doxywizard.ico
 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
+Patch0: doxygen-obsolete-egrep.patch
 
 BuildRequires: %{_bindir}/python3
 BuildRequires: gcc-c++ gcc
-BuildRequires: perl-interpreter
+BuildRequires: perl-interpreter, perl-open
+BuildRequires: texlive-bibtex
+
 %if ! 0%{?_module_build}
 BuildRequires: tex(dvips)
 BuildRequires: tex(latex)
@@ -111,16 +112,14 @@ BuildRequires: ghostscript
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: graphviz
-%else
-BuildRequires: zlib-devel
 %endif
+BuildRequires: zlib-devel
 BuildRequires: flex
 BuildRequires: bison
 BuildRequires: cmake
 BuildRequires: git
 %if "x%{?xapian_core_support}" == "xON"
 BuildRequires: xapian-core-devel
-BuildRequires: zlib-devel
 %endif
 %if "x%{?clang_support}" == "xON"
 BuildRequires: llvm-devel
@@ -151,6 +150,7 @@ Summary: Support for producing latex/pdf output from doxygen
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: tex(latex)
 Requires: tex(dvips)
+Requires: texlive-wasy
 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
 # From doc/manual.sty
 Requires: tex(helvet.sty)
@@ -321,6 +321,33 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %endif
 
 %changelog
+* Fri Mar 10 2023 Than Ngo <than@redhat.com> - 2:1.9.6-7
+- replace obsolescent egrep with grep -E 
+
+* Fri Feb 17 2023 Than Ngo <than@redhat.com> - 2:1.9.6-6
+- migrated to SPDX license
+
+* Wed Jan 25 2023 Than Ngo <than@redhat.com> - 2:1.9.6-5
+- rebuilt against new ghostscript-10 
+
+* Fri Jan 20 2023 Than Ngo <than@redhat.com> - 2:1.9.6-4
+- fixed bz#2162170, add Require on texlive-wasy
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 18 2023 Than Ngo <than@redhat.com> - 2:1.9.6-2
+- fixed bz#2161515 - doxygen FTBFS if _module_build is 1
+
+* Tue Jan 03 2023 Than Ngo <than@redhat.com> - 2:1.9.6-1
+- fixed bz#2156564, update to 1.9.6
+
+* Sun Sep 18 2022 Pete Walter <pwalter@fedoraproject.org> - 2:1.9.5-2
+- Rebuild for llvm 15
+
+* Fri Sep 09 2022 Than Ngo <than@redhat.com> - 2:1.9.5-1
+- 1.9.5
+
 * Thu Aug 04 2022 Than Ngo <than@redhat.com> - 2:1.9.4-2
 - Fixed #2113876, Failed to build LaTex output 
 

sources

@@ -1,2 +1,2 @@
 SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
-SHA512 (doxygen-1.9.4.src.tar.gz) = 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a
+SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2