From e02538eee56ffe432cbfd4084212cc22d063c8af Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 20:18:55 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/cppcheck.git#8b7b1c4cbd621c77e19e06e402caf80909d8e4ab --- cppcheck.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cppcheck.spec b/cppcheck.spec index 7a33dfd..ff3c7ec 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -2,7 +2,7 @@ Name: cppcheck Version: 2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for static C/C++ code analysis License: GPLv3+ URL: http://cppcheck.wiki.sourceforge.net/ @@ -73,7 +73,7 @@ from xml files first generated using cppcheck. rm -r externals/tinyxml # Generate the Qt online-help file cd gui/help -qhelpgenerator-qt5 online-help.qhcp -o online-help.qhc +TZ=UTC qhelpgenerator-qt5 online-help.qhcp -o online-help.qhc %build # Manuals @@ -122,7 +122,16 @@ cd %{_vpath_builddir}/bin %files htmlreport %{_bindir}/cppcheck-htmlreport +%post +# Adjust the timestamp of online-help.qch to the value expected by online-help.qhc +# The rpm is built on servers using UTC. Get this UTC timestamp and apply it to the file under the local TZ +# https://github.com/danmar/cppcheck/commit/9693940dadfd54bb0bac2549e1b2d6804be9a1a8#commitcomment-43482215 +touch -a -m -t $(TZ=UTC date -r /usr/share/Cppcheck/help/online-help.qch +%Y%m%d%H%M.%%S) /usr/share/Cppcheck/help/online-help.qch + %changelog +* Thu Oct 22 2020 Wolfgang Stöggl - 2.2-4 +- Fix missing Contents and Index in Qt online-help file + * Tue Oct 13 2020 Jeff Law - 2.2-3 - Fix missing #include for gcc-11