diff --git a/.gitignore b/.gitignore index e12cfb1..a007b45 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ doxygen-1.7.1.src.tar.gz /doxygen-1.13.0.src.tar.gz /doxygen-1.13.1.src.tar.gz /doxygen-1.13.2.src.tar.gz +/doxygen-1.14.0.src.tar.gz +/doxygen-1.15.0.src.tar.gz diff --git a/doxygen.spec b/doxygen.spec index 0aee136..7818615 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,21 +1,23 @@ %if 0%{?fedora} %global xapian_core_support ON -%global clang_support OFF %global build_wizard ON +%global system_spdlog ON +%global system_fmt ON %else %global xapian_core_support OFF -%global clang_support OFF %global build_wizard OFF +%global system_spdlog OFF +%global system_fmt OFF %endif %global build_search %{xapian_core_support} -%global system_spdlog ON +%global clang_support ON %global system_sqlite3 ON Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 -Version: 1.13.2 -Release: 4%{?dist} +Version: 1.15.0 +Release: 1%{?dist} # No version is specified. License: GPL-2.0-or-later Url: https://github.com/doxygen @@ -116,10 +118,23 @@ BuildRequires: gcc-c++ gcc %endif %if "%{system_spdlog}" == "ON" BuildRequires: spdlog-devel +%else +# SPDLOG_VER* defined in deps/spdlog/include/spdlog/version.h +Provides: bundled(spdlog) = 1.14.1 %endif %if "%{system_sqlite3}" == "ON" BuildRequires: sqlite-devel +%else +# SQLITE_VERSION defined in deps/sqlite3/sqlite3.h +Provides: bundled(sqlite) = 3.42.0 %endif +%if "%{system_fmt}" == "ON" +BuildRequires: fmt-devel +%else +# deps/fmt/README.md +Provides: bundled(fmt) = 10.2.1 +%endif + Requires: perl-interpreter Requires: graphviz @@ -141,7 +156,8 @@ Javascript files for use by locally installed Doxygen documentation. %package doxywizard Summary: A GUI for creating and editing configuration files Requires: %{name} = %{epoch}:%{version}-%{release} -BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtsvg-devel %description doxywizard Doxywizard is a GUI for creating and editing configuration files that @@ -227,11 +243,6 @@ Requires: texlive-epstopdf %prep %autosetup -p1 -a2 -# convert into utf-8 -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 - cp %{SOURCE3} . %build @@ -246,7 +257,8 @@ cp %{SOURCE3} . -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -Dbuild_xmlparser=ON \ -Duse_sys_sqlite3=%{system_sqlite3} \ - -Duse_sys_spdlog=%{system_spdlog} + -Duse_sys_spdlog=%{system_spdlog} \ + -Duse_sys_fmt=%{system_fmt} %cmake_build %{?_smp_mflags} @@ -278,8 +290,8 @@ rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/d rm -rf %{buildroot}/%{_docdir}/packages # Install the asset files. -install -m644 -D --target-directory=%{buildroot}%{_jsdir}/doxygen \ - templates/html/*.js +install -m644 -D --target-directory=%{buildroot}%{_jsdir}/doxygen templates/html/*.js + # Generate the macros file. Expand version/release/%%_jsdir. mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.doxygen <<'EOF' @@ -287,7 +299,8 @@ cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.doxygen <<'EOF' %%doxygen_unbundle_buildroot() %%{_rpmconfigdir}/redhat/doxygen-unbundler "%{_jsdir}" "%%{buildroot}" %%[ %%# == 0 ? "%%{_docdir}" : "%%1"] %%doxygen_unbundle() %{_rpmconfigdir}/redhat/doxygen-unbundler "%{_jsdir}" "" %%* EOF -# Install the unbundler script. + + # Install the unbundler script. install -m755 -D --target-directory=%{buildroot}%{_rpmconfigdir}/redhat %{SOURCE4} %check @@ -327,6 +340,24 @@ install -m755 -D --target-directory=%{buildroot}%{_rpmconfigdir}/redhat %{SOURCE %endif %changelog +* Thu Nov 13 2025 Than Ngo - 2:1.15.0-1 +- Update to 1.15.0 + +* Wed Jul 23 2025 Fedora Release Engineering - 2:1.14.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jun 25 2025 Than Ngo - 2:1.14.0-3 +- Upstream fix for input buffer overflow + +* Wed May 28 2025 Yaakov Selkowitz - 2:1.14.0-2 +- Use bundled spdlog on RHEL, redux + +* Sun May 25 2025 Than Ngo - 2:1.14.0-1 +- Fix rhbz#2368381, update to 1.14.0 + +* Tue Feb 11 2025 Yaakov Selkowitz - 2:1.13.2-5 +- Use bundled spdlog on RHEL + * Mon Feb 10 2025 Than Ngo - 2:1.13.2-4 - built with system sqlite3 and spdlog diff --git a/sources b/sources index 495571b..7883325 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.13.2.src.tar.gz) = 7b6b3285706e10c0b27230503b83cc669aec83ebc3ef9cc1087d5e36118fd726a5368d567dd553ba01acf4d739cdbb41c5e66af4541fc8e51effbbdaa241c812 +SHA512 (doxygen-1.15.0.src.tar.gz) = e53cc8da6cf1fe3ca3b3637647ed6afa28365351eac81d010f6691d939df5e449b3d898a6f695dd850d12659dfd7018fc864071b30fbca5dd196dc094ec4371e