From 63bccc73d6974129e3f63cee3ac89e49a60b2304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
Date: Sun, 10 Sep 2023 14:58:13 +0200
Subject: [PATCH] Update to 2.12.0

- Remove cppcheck-2.11-versions.patch
  The version string always has 3 parts now
  https://github.com/danmar/cppcheck/commit/767c0fb
---
 .gitignore                   |  1 +
 cppcheck-2.11-versions.patch | 12 ------------
 cppcheck.spec                | 17 +++++++++--------
 sources                      |  2 +-
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 cppcheck-2.11-versions.patch

diff --git a/.gitignore b/.gitignore
index de097af..b8489d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ cppcheck-1.44.tar.bz2
 /cppcheck-2.8.2.tar.gz
 /cppcheck-2.9.tar.gz
 /cppcheck-2.11.tar.gz
+/cppcheck-2.12.0.tar.gz
diff --git a/cppcheck-2.11-versions.patch b/cppcheck-2.11-versions.patch
deleted file mode 100644
index e7deeef..0000000
--- a/cppcheck-2.11-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp cppcheck-2.11.orig/cmake/versions.cmake cppcheck-2.11/cmake/versions.cmake
---- cppcheck-2.11.orig/cmake/versions.cmake	2023-06-22 05:07:56.000000000 -0400
-+++ cppcheck-2.11/cmake/versions.cmake	2023-06-22 15:43:59.383790291 -0400
-@@ -3,7 +3,7 @@ SET(VERSION "2.11")
- STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
- LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
- LIST(GET VERSION_PARTS 1 VERSION_MINOR)
--LIST(GET VERSION_PARTS 2 VERSION_PATCH)
-+#LIST(GET VERSION_PARTS 2 VERSION_PATCH)
- SET(SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
- 
- # Postfix of so's:
diff --git a/cppcheck.spec b/cppcheck.spec
index 71f4ec3..759344c 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -1,8 +1,8 @@
 %undefine __cmake_in_source_build
 
 Name:           cppcheck
-Version:        2.11
-Release:        2%{?dist}
+Version:        2.12.0
+Release:        1%{?dist}
 Summary:        Tool for static C/C++ code analysis
 License:        GPL-3.0
 URL:            http://cppcheck.wiki.sourceforge.net/
@@ -10,8 +10,6 @@ Source0:        https://github.com/danmar/%{name}/archive/%{version}.tar.gz#/%{n
 
 # Fix location of translations
 Patch0:         cppcheck-2.11-translations.patch
-# Cmake was erroring out with LIST index: 2 out of range (-2, 1)
-Patch1:         cppcheck-2.11-versions.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  pcre-devel
@@ -56,7 +54,6 @@ from xml files first generated using cppcheck.
 %prep
 %setup -q
 %patch -P0 -p1 -b .translations
-%patch -P1 -p1 -b .python3
 # Make sure bundled tinyxml2 is not used
 rm -r externals/tinyxml2
 # Generate the Qt online-help file
@@ -90,9 +87,10 @@ install -D -p -m 755 htmlreport/cppcheck-htmlreport %{buildroot}%{_bindir}/cppch
 # Restore execute permission of python files
 grep -l "#\!/usr/bin/env python3" %{buildroot}%{_datadir}/Cppcheck/addons/*.py | xargs chmod +x
 
-##% check
-##cd %{_vpath_builddir}/bin
-##./ testrunner -g -q
+%check
+cd %{_vpath_builddir}/bin
+#./testrunner -g -q
+# 2 style tests failing under 2.11 and 2.12.0 (aarch64, ppc64le, s390x)
 
 %files
 %doc AUTHORS man/manual.html man/reference-cfg-format.html
@@ -112,6 +110,9 @@ grep -l "#\!/usr/bin/env python3" %{buildroot}%{_datadir}/Cppcheck/addons/*.py |
 %{_bindir}/cppcheck-htmlreport
 
 %changelog
+* Sun Sep 10 2023 Wolfgang Stöggl <c72578@yahoo.de> - 2.12.0-1
+- Update to 2.12.0 (#2165211)
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 7d775b6..0ebc0b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cppcheck-2.11.tar.gz) = 04e558f5cf75af6383757106b9d777dce724db134b73db71d2f0b4f428ca0ca79fc94ce1d3e88a5dd7985d093e9a4163f05679b4b37ccf3e7405f68e439d7fd6
+SHA512 (cppcheck-2.12.0.tar.gz) = 0352094443477f772944b4dd6a989e6df1dfcf332aa19b7610dad8c9f5371f4a49d4ca14fdcd9cdaf5579ba5a5fc8f25c2b2e0380b72380ea8fcfde1e51f50d5