New upstream version 2.0

- Use BR qt5-qtbase-devel, now that the metapackage qt5-devel has
  been removed
- BR qt5-linguist is now required in general
- Add cppcheck-2.0-fix-cmake-version.patch
This commit is contained in:
Wolfgang Stöggl 2020-05-10 23:34:00 +02:00
parent 275919b43c
commit 3dbf2c5cc8
4 changed files with 33 additions and 7 deletions

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ cppcheck-1.44.tar.bz2
/cppcheck-1.88.tar.gz
/cppcheck-1.89.tar.gz
/cppcheck-1.90.tar.gz
/cppcheck-2.0.tar.gz

View File

@ -0,0 +1,20 @@
From 809a769c690d8ab6fef293e41a29c8490512866e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 10 May 2020 15:38:01 +0200
Subject: [PATCH] Try to make Travis happy
---
cmake/versions.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index 4c6c27fd9d..adf6393cc7 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,5 +1,5 @@
# Version for libraries CPP
-SET(VERSION "2.0")
+SET(VERSION "2.0.0")
STRING(REGEX MATCHALL "[0-9]" VERSION_PARTS "${VERSION}")
LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
LIST(GET VERSION_PARTS 1 VERSION_MINOR)

View File

@ -2,8 +2,8 @@
%global gui 1
Name: cppcheck
Version: 1.90
Release: 5%{?dist}
Version: 2.0
Release: 1%{?dist}
Summary: Tool for static C/C++ code analysis
License: GPLv3+
URL: http://cppcheck.wiki.sourceforge.net/
@ -15,6 +15,9 @@ Patch0: cppcheck-1.90-tinyxml.patch
Patch1: cppcheck-1.89-translations.patch
# Select python3 explicitly
Patch2: cppcheck-1.88-htmlreport-python3.patch
# Fix CMake Error at cmake/versions.cmake:6
# https://github.com/danmar/cppcheck/commit/809a769
Patch3: cppcheck-2.0-fix-cmake-version.patch
BuildRequires: gcc-c++
BuildRequires: pcre-devel
@ -24,16 +27,14 @@ BuildRequires: pandoc
BuildRequires: desktop-file-utils
BuildRequires: tinyxml2-devel >= 2.1.0
BuildRequires: zlib-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-linguist
%if %{gui}
%if 0%{?rhel} == 7
# no qt5-devel metapackage!
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-linguist
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: cmake3
%else
BuildRequires: qt5-devel
BuildRequires: python3-devel
BuildRequires: cmake
%endif
@ -76,6 +77,7 @@ from xml files first generated using cppcheck.
%patch0 -p1 -b .tinyxml
%patch1 -p1 -b .translations
%patch2 -p1 -b .python3
%patch3 -p1 -b .cmake-version
# Make sure bundled tinyxml is not used
rm -r externals/tinyxml
@ -137,6 +139,9 @@ cd objdir-%{_target_platform}/bin
%{_bindir}/cppcheck-htmlreport
%changelog
* Sun May 10 2020 Wolfgang Stöggl <c72578@yahoo.de> - 2.0-1
- New upstream version 2.0
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.90-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (cppcheck-1.90.tar.gz) = 9d78ed05af3d46f399de1a993859cf41ec3abc9cd869e1e85c10af7f70e00487ada0c0134d049e0ace50b3f4913680b4f0e4fa94a5fde13833285879994303db
SHA512 (cppcheck-2.0.tar.gz) = 9f559564f875c2818e8b997aa3a3cc74e685169ebe829f3a41f20cd266b08cb7685efd5c266d877ada59576b8bf49ec04aead9f77d5781d3e0eb7a5d881ef281