diff --git a/doxygen-1.9.6.src.tar.gz b/doxygen-1.9.8.src.tar.gz similarity index 37% rename from doxygen-1.9.6.src.tar.gz rename to doxygen-1.9.8.src.tar.gz index 50d904054e6f764ccc833b29fde20d27edf824ea..5655694a5ebd308eba88b524bd1f5b97e325c04f 100644 Binary files a/doxygen-1.9.6.src.tar.gz and b/doxygen-1.9.8.src.tar.gz differ diff --git a/doxygen.spec b/doxygen.spec index a31e5cd2387fec5c5369a06d0c526686172559fc..2a37dc911226ce52eab373bb88b7af1ba92229d9 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 %global xapian_core_support ON %global clang_support ON @@ -8,7 +8,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 -Version: 1.9.6 +Version: 1.9.8 Release: %{anolis_release}%{?dist} # No version is specified. License: GPL+ @@ -24,7 +24,6 @@ BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc BuildRequires: perl-interpreter, perl-open BuildRequires: texlive-bibtex -%if ! 0%{?_module_build} BuildRequires: tex(dvips) BuildRequires: tex(latex) # From doc/manual.sty @@ -87,7 +86,6 @@ BuildRequires: ghostscript BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: graphviz -%endif BuildRequires: zlib-devel BuildRequires: flex BuildRequires: bison @@ -110,7 +108,6 @@ documentation is extracted directly from the sources. Doxygen can also be configured to extract the code structure from undocumented source files. -%if ! 0%{?_module_build} %package doxywizard Summary: A GUI for creating and editing configuration files Requires: %{name} = %{EVR} @@ -190,7 +187,6 @@ Requires: texlive-epstopdf %description latex %{summary}. -%endif %prep @@ -201,9 +197,11 @@ iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO +# drop buggy unicode test +rm -fr testing/061* + %build -%if ! 0%{?_module_build} %cmake \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -Duse_libclang=%{clang_support} \ @@ -214,18 +212,7 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO -DMAN_INSTALL_DIR=%{_mandir}/man1 \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ -%else -%cmake \ - -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ - -Duse_libclang=%{clang_support} \ - -Dbuild_doc=OFF \ - -Dbuild_wizard=OFF \ - -Dbuild_xmlparser=ON \ - -Dbuild_search=OFF \ - -DMAN_INSTALL_DIR=%{_mandir}/man1 \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DBUILD_SHARED_LIBS=OFF \ -%endif +%{nil} %cmake_build @@ -243,9 +230,6 @@ install -m644 -p -D doxywizard-3.png $icondir/128x128/apps/doxywizard.png # install man pages mkdir -p %{buildroot}/%{_mandir}/man1 cp doc/*.1 %{buildroot}/%{_mandir}/man1/ -%if 0%{?_module_build} -rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1* -%endif %if "x%{?xapian_core_support}" == "xOFF" rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1* @@ -254,9 +238,7 @@ rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/d # remove duplicate rm -rf %{buildroot}/%{_docdir}/packages -%if ! 0%{?_module_build} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} -%endif %check %ctest @@ -264,32 +246,30 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %files %doc LANGUAGE.HOWTO README.md %license LICENSE -%if ! 0%{?_module_build} %if "x%{?xapian_core_support}" == "xON" %{_bindir}/doxyindexer %{_bindir}/doxysearch* %endif -%endif %{_bindir}/doxygen %{_mandir}/man1/doxygen.1* %if "x%{?xapian_core_support}" == "xON" %{_mandir}/man1/doxyindexer.1* %{_mandir}/man1/doxysearch.1* %endif -%if ! 0%{?_module_build} + %files doxywizard %{_bindir}/doxywizard %{_mandir}/man1/doxywizard* %{_datadir}/applications/doxywizard.desktop -%endif %{_datadir}/icons/hicolor/*/apps/doxywizard.png -%if ! 0%{?_module_build} %files latex # intentionally left blank -%endif %changelog +* Sun Aug 27 2023 Funda Wang - 1:1.9.8-1 +- New version 1.9.8 + * Fri Apr 14 2023 Funda Wang - 1:1.9.6-3 - Rebuild for new clang