From 00d0476e494912ade9283e5eded3cba55101c795 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Thu, 8 Nov 2018 16:29:42 +0100
Subject: [PATCH] Update to 1.85.

---
 cppcheck-1.85-htmlreport-python2.patch | 27 ++++++++++++++++++++++++++
 cppcheck.spec                          |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 cppcheck-1.85-htmlreport-python2.patch

diff --git a/cppcheck-1.85-htmlreport-python2.patch b/cppcheck-1.85-htmlreport-python2.patch
new file mode 100644
index 0000000..11de44b
--- /dev/null
+++ b/cppcheck-1.85-htmlreport-python2.patch
@@ -0,0 +1,27 @@
+diff -urp cppcheck-1.85.orig/htmlreport/cppcheck-htmlreport cppcheck-1.85/htmlreport/cppcheck-htmlreport
+--- cppcheck-1.85.orig/htmlreport/cppcheck-htmlreport	2018-10-14 14:56:51.000000000 +0200
++++ cppcheck-1.85/htmlreport/cppcheck-htmlreport	2018-11-08 16:26:00.527947956 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ from __future__ import unicode_literals
+ 
+diff -urp cppcheck-1.85.orig/htmlreport/setup.py cppcheck-1.85/htmlreport/setup.py
+--- cppcheck-1.85.orig/htmlreport/setup.py	2018-10-14 14:56:51.000000000 +0200
++++ cppcheck-1.85/htmlreport/setup.py	2018-11-08 16:26:40.266947340 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ from setuptools import setup
+ 
+diff -urp cppcheck-1.85.orig/htmlreport/test_htmlreport.py cppcheck-1.85/htmlreport/test_htmlreport.py
+--- cppcheck-1.85.orig/htmlreport/test_htmlreport.py	2018-10-14 14:56:51.000000000 +0200
++++ cppcheck-1.85/htmlreport/test_htmlreport.py	2018-11-08 16:26:25.963947562 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ """Test cppcheck-htmlreport."""
+ 
+ import os
diff --git a/cppcheck.spec b/cppcheck.spec
index 64413b4..46d232a 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -15,6 +15,8 @@ Patch0:         cppcheck-1.85-tinyxml.patch
 Patch1:         cppcheck-1.84-translations.patch
 # Set location of config files
 Patch2:         cppcheck-1.78-cfgdir.patch
+# Select python2 explicitly
+Patch3:         cppcheck-1.85-htmlreport-python2.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  pcre-devel
@@ -71,6 +73,7 @@ from xml files first generated using cppcheck.
 %patch0 -p1 -b .tinyxml
 %patch1 -p1 -b .translations
 %patch2 -p1 -b .cfgdir
+%patch3 -p1 -b .python2
 # Make sure bundled tinyxml is not used
 rm -r externals/tinyxml