Update to 2.6

- Remove the following patch, which is not needed anymore in 2.6:
  cppcheck-2.5-fix_failed_to_load_translation_for_English.patch
- Remove -DNO_UNIX_SIGNAL_HANDLING to CXXFLAGS, due to new upstream
  fix: https://github.com/danmar/cppcheck/commit/8869ee3
- Restore execute permission of python files.
  Fixes rpmlint errors (8x): E: non-executable-script

.gitignore

@@ -47,9 +47,3 @@ cppcheck-1.44.tar.bz2
 /cppcheck-2.3.tar.gz
 /cppcheck-2.5.tar.gz
 /cppcheck-2.6.tar.gz
-/cppcheck-2.7.tar.gz
-/cppcheck-2.7.3.tar.gz
-/cppcheck-2.7.4.tar.gz
-/cppcheck-2.8.tar.gz
-/cppcheck-2.8.2.tar.gz
-/cppcheck-2.9.tar.gz

cppcheck-2.5-disable-test-testexprengine-array7.patch

@@ -0,0 +1,13 @@
+diff --git a/test/testexprengine.cpp b/test/testexprengine.cpp
+index f23671a3d..c6069b49c 100644
+--- a/test/testexprengine.cpp
++++ b/test/testexprengine.cpp
+@@ -92,7 +92,7 @@ private:
+         TEST_CASE(array4);
+         TEST_CASE(array5);
+         TEST_CASE(array6);
+-        TEST_CASE(array7);
++        // TEST_CASE(array7);
+         TEST_CASE(arrayInit1);
+         TEST_CASE(arrayInit2);
+         TEST_CASE(arrayInit3);

cppcheck.spec

@@ -1,10 +1,10 @@
 %undefine __cmake_in_source_build
 
 Name:           cppcheck
-Version:        2.9
-Release:        4%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        Tool for static C/C++ code analysis
-License:        GPL-3.0
+License:        GPLv3+
 URL:            http://cppcheck.wiki.sourceforge.net/
 Source0:        https://github.com/danmar/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
@@ -12,6 +12,9 @@ Source0:        https://github.com/danmar/%{name}/archive/%{version}.tar.gz#/%{n
 Patch0:         cppcheck-2.2-translations.patch
 # Select python3 explicitly
 Patch1:         cppcheck-1.88-htmlreport-python3.patch
+# Disable one test, which fails under 32-bit archs i686 and armv7hl
+# https://trac.cppcheck.net/ticket/10282
+Patch2:         cppcheck-2.5-disable-test-testexprengine-array7.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  pcre-devel
@@ -23,11 +26,10 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  tinyxml2-devel >= 2.1.0
 BuildRequires:  zlib-devel
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  z3-devel >= 4.7.1
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qttools-devel
 BuildRequires:  qt5-linguist
-BuildRequires: make
 
 
 %description
@@ -57,6 +59,7 @@ from xml files first generated using cppcheck.
 %setup -q
 %patch0 -p1 -b .translations
 %patch1 -p1 -b .python3
+%patch2 -p1 -b .array7
 # Make sure bundled tinyxml2 is not used
 rm -r externals/tinyxml2
 # Generate the Qt online-help file
@@ -71,7 +74,7 @@ pandoc man/reference-cfg-format.md -o man/reference-cfg-format.html -s --number-
 
 # Binaries
 # Upstream doesn't support shared libraries (unversioned solib)
-%cmake -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DHAVE_RULES=yes -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck -DUSE_BUNDLED_TINYXML2=OFF -DENABLE_OSS_FUZZ=OFF
+%cmake -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DUSE_Z3=yes -DHAVE_RULES=yes -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck -DUSE_BUNDLED_TINYXML2=OFF
 %cmake_build
 
 %install
@@ -112,63 +115,15 @@ cd %{_vpath_builddir}/bin
 %{_bindir}/cppcheck-htmlreport
 
 %changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jan 13 2023 Steve Grubb <sgrubb@redhat.com> - 2.9-3
-- SPDX Migration
-
-* Sun Sep 25 2022 Rich Mattes <richmattes@gmail.com> - 2.9-2
-- Rebuild for tinyxml2-9.0.0
-
-* Sun Aug 28 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.9-1
-- Update to 2.9
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jul 16 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.8.2-1
-- Update to 2.8.2
-
-* Wed May 25 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.8-1
-- Update to 2.8
-
-* Thu May 19 2022 Jerry James <loganjerry@gmail.com> - 2.7.4-2
-- Rebuild for z3 4.8.17
-
-* Fri Mar 25 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7.4-1
-- Update to 2.7.4
-
-* Wed Mar 23 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7.3-2
-- Update tinyxml2 patch, add upstream link and rebuild
-
-* Sat Mar 19 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7.3-1
-- Update to 2.7.3.
-
-* Tue Feb 08 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7-1
-- Update to 2.7.
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Sat Oct 02 2021 Wolfgang Stöggl <c72578@yahoo.de> - 2.6-1
 - Update to 2.6.
 
-* Fri Jul 23 2021 Wolfgang Stöggl <c72578@yahoo.de> - 2.5-3
+* Fri Jul 23 2021 Wolfgang Stöggl <c72578@yahoo.de> - 2.5-2
 - Fix Failed to load translation for English (#1983599)
 
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Sun Jul 04 2021 Wolfgang Stöggl <c72578@yahoo.de> - 2.5-1
 - Update to 2.5.
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 05 2021 Timm Bäder <tbaeder@redhat.com> - 2.3-2
-- Explicitly disable oss-fuzz
-
 * Sat Dec 05 2020 Wolfgang Stöggl <c72578@yahoo.de> - 2.3-1
 - Update to 2.3.
 

sources

@@ -1 +1 @@
-SHA512 (cppcheck-2.9.tar.gz) = 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
+SHA512 (cppcheck-2.6.tar.gz) = 6abe518cb9d80c4d0fcc5d47a317f45f177a30372846008f5c65352db91e7de74e6ec6d500d1d18b8cd29a91e3974df125efb35c14c7814c9640741b3827fc2a