Revert "Update to 2.10"

This reverts commit 2fd9c1984d.
Update to 2.10
2023-02-02 19:01:48 -05:00 · 2023-02-02 18:09:51 -05:00 · 2023-01-19 00:35:14 +00:00 · 2023-01-13 10:03:49 -05:00 · 2022-09-25 14:40:13 -04:00 · 2022-08-28 16:34:32 +02:00
4 changed files with 47 additions and 23 deletions
--- a/.gitignore
+++ b/.gitignore
@ -47,3 +47,9 @@ 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
--- a/cppcheck-2.5-disable-test-testexprengine-array7.patch
+++ b/cppcheck-2.5-disable-test-testexprengine-array7.patch
@ -1,13 +0,0 @@
-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);
--- a/cppcheck.spec
+++ b/cppcheck.spec
@ -1,10 +1,10 @@
 %undefine __cmake_in_source_build

 Name:           cppcheck
-Version:        2.6
-Release:        2%{?dist}
+Version:        2.9
+Release:        4%{?dist}
 Summary:        Tool for static C/C++ code analysis
-License:        GPLv3+
+License:        GPL-3.0
 URL:            http://cppcheck.wiki.sourceforge.net/
 Source0:        https://github.com/danmar/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz

@ -12,9 +12,6 @@ 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
@ -27,7 +24,6 @@ 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
@ -61,7 +57,6 @@ 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
@ -76,7 +71,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 -DUSE_Z3=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 -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_build

 %install
@ -117,6 +112,42 @@ 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (cppcheck-2.6.tar.gz) = 6abe518cb9d80c4d0fcc5d47a317f45f177a30372846008f5c65352db91e7de74e6ec6d500d1d18b8cd29a91e3974df125efb35c14c7814c9640741b3827fc2a
+SHA512 (cppcheck-2.9.tar.gz) = 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
Author	SHA1	Message	Date
Steve Grubb	dc3a190b2f	Revert "Update to 2.10" This reverts commit `2fd9c1984d`.	2023-02-02 19:01:48 -05:00
Steve Grubb	2fd9c1984d	Update to 2.10 Drop python3 patch as new version uses python3	2023-02-02 18:09:51 -05:00
Fedora Release Engineering	b16bda44e7	Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-01-19 00:35:14 +00:00
Steve Grubb	1f301daa60	SPDX Migration	2023-01-13 10:03:49 -05:00
Rich Mattes	c2a89aefa3	Rebuild for tinyxml2-9.0.0	2022-09-25 14:40:13 -04:00
Wolfgang Stöggl	c375328a31	Update to 2.9	2022-08-28 16:34:32 +02:00
Fedora Release Engineering	411869e6e3	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-20 23:39:47 +00:00
Wolfgang Stöggl	69bb397641	Update to 2.8.2	2022-07-16 06:22:17 +02:00
Wolfgang Stöggl	cbf882a9c7	Update to 2.8 - Remove z3-devel, see upstream: https://github.com/danmar/cppcheck/commit/8f386e1	2022-05-25 06:14:16 +02:00
Jerry James	84ec457e0a	Rebuild for z3 4.8.17	2022-05-19 13:41:06 -06:00
Wolfgang Stöggl	055678f7d2	Update to 2.7.4 - Remove patch: cppcheck-2.7.3-tinyxml2.patch	2022-03-25 21:31:10 +01:00
Wolfgang Stöggl	bc53bd0890	Update tinyxml2 patch and add upstream link - Do not use z3 in case of i686. The i686 build fails since z3-4.8.15-1	2022-03-23 22:26:24 +01:00
Wolfgang Stöggl	ef547dcd11	Simplify cppcheck-2.7.3-tinyxml2.patch	2022-03-19 17:20:53 +01:00
Wolfgang Stöggl	9e60ef3b47	Update to 2.7.3 - Update tinyxml2 patch: cppcheck-2.7.3-tinyxml2.patch - Remove patch: cppcheck-2.7-disable-test-testmathlib-tostring.patch	2022-03-19 15:21:17 +01:00
Wolfgang Stöggl	84bdb32ee3	Update to 2.7 - Add the following patches: cppcheck-2.7-tinyxml2.patch cppcheck-2.7-disable-test-testmathlib-tostring.patch - Remove patch: cppcheck-2.5-disable-test-testexprengine-array7.patch	2022-02-09 21:00:27 +01:00