From 1bfe4470b798f422185f20b89cdec3d0b71a1e03 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Feb 15 2016 16:50:43 +0000
Subject: 0.15-1


---

diff --git a/.gitignore b/.gitignore
index 6e34dc9..2d04e63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /gcc-python-plugin-0.12.tar.gz
 /gcc-python-plugin-0.13.tar.gz
 /gcc-python-plugin-0.14.tar.gz
+/gcc-python-plugin-0.15.tar.gz
diff --git a/arm-fixes.patch b/arm-fixes.patch
index e6d8a3d..5043b89 100644
--- a/arm-fixes.patch
+++ b/arm-fixes.patch
@@ -1,12 +1,10 @@
-diff -up gcc-python-plugin-0.14/run-test-suite.py.arm-fixes.patch gcc-python-plugin-0.14/run-test-suite.py
---- gcc-python-plugin-0.14/run-test-suite.py.arm-fixes.patch	2015-05-06 14:35:55.488993502 -0400
-+++ gcc-python-plugin-0.14/run-test-suite.py	2015-05-06 14:37:17.762098700 -0400
-@@ -727,7 +727,14 @@ if GCC_VERSION >= 5000:
- if sys.version_info[0] == 3 and sys.version_info[1] >= 4:
+diff -up gcc-python-plugin-0.15/run-test-suite.py.arm-fixes.patch gcc-python-plugin-0.15/run-test-suite.py
+--- gcc-python-plugin-0.15/run-test-suite.py.arm-fixes.patch	2016-02-15 09:56:54.536491277 -0500
++++ gcc-python-plugin-0.15/run-test-suite.py	2016-02-15 09:57:48.666250154 -0500
+@@ -728,6 +728,13 @@ if sys.version_info[0] == 3 and sys.vers
      exclude_test('tests/plugin/callgraph')
      exclude_test('tests/plugin/rtl')
-- 
-+
+ 
 +# Tests failing on armv7hl with gcc-4.9.1-11.fc22
 +for test in ('''
 +  tests/cpychecker/absinterp/array-range/fully-checked-on-stack
@@ -14,6 +12,6 @@ diff -up gcc-python-plugin-0.14/run-test-suite.py.arm-fixes.patch gcc-python-plu
 +'''.split()):
 +    exclude_test(test)
 +
- def run_one_test(testdir):
-     try:
-         sys.stdout.write('%s: ' % testdir)
+ # Tests that are over-specified and only work for GCC 6 and later:
+ if GCC_VERSION < 6000:
+     exclude_test('tests/examples/find-global-state')
diff --git a/fix-python-3.4-failures.patch b/fix-python-3.4-failures.patch
deleted file mode 100644
index 479a4e1..0000000
--- a/fix-python-3.4-failures.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up gcc-python-plugin-0.14/run-test-suite.py.fix-python-3.4-failures gcc-python-plugin-0.14/run-test-suite.py
---- gcc-python-plugin-0.14/run-test-suite.py.fix-python-3.4-failures	2015-05-06 14:33:54.315784199 -0400
-+++ gcc-python-plugin-0.14/run-test-suite.py	2015-05-06 14:34:39.763737503 -0400
-@@ -723,10 +723,11 @@ if GCC_VERSION >= 5000:
-         exclude_test('tests/cpychecker/refcounts/uninitialized_data/function_arg')
-         exclude_test('tests/cpychecker/refcounts/use_after_dealloc')
- 
--# Tests failing on Python 3.4:
--if sys.version_info[:2] == (3, 4):
-+# Tests failing due to repr changes in Python 3.4+
-+if sys.version_info[0] == 3 and sys.version_info[1] >= 4:
-     exclude_test('tests/plugin/callgraph')
--
-+    exclude_test('tests/plugin/rtl')
-+ 
- def run_one_test(testdir):
-     try:
-         sys.stdout.write('%s: ' % testdir)
diff --git a/gcc-python-plugin.spec b/gcc-python-plugin.spec
index 71435f5..6fb5560 100644
--- a/gcc-python-plugin.spec
+++ b/gcc-python-plugin.spec
@@ -42,15 +42,14 @@
 
 
 Name:           gcc-python-plugin
-Version:        0.14
-Release:        9%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        GCC plugin that embeds Python
 
 Group:          Development/Languages
 License:        GPLv3+
 URL:            https://fedorahosted.org/gcc-python-plugin/
 Source0:        https://fedorahosted.org/releases/g/c/gcc-python-plugin/gcc-python-plugin-%{version}.tar.gz
-Patch1:         fix-python-3.4-failures.patch
 Patch2:         arm-fixes.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -178,7 +177,6 @@ This package contains API documentation for the GCC Python plugin
 
 %prep
 %setup -q
-%patch1 -p1 -b .fix-python-3.4-failures
 %patch2 -p1 -b .arm-fixes.patch
 
 # We will be building the plugin 4 times, each time against a different
@@ -445,6 +443,11 @@ CheckPlugin \
 %doc examples
 
 %changelog
+* Mon Feb 15 2016 David Malcolm <dmalcolm@redhat.com> - 0.15-1
+- 0.15
+- drop fix-python-3.4-failures.patch (upstreamed)
+- regenerate arm-fixes.patch
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.14-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 0568e10..81e0b1e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-a25ee9b2cf046c2db65c0bc6d6204b5b  gcc-python-plugin-0.13.tar.gz
-7e11518ff907414541b70f6efdb5ccc0  gcc-python-plugin-0.14.tar.gz
+c26920ea342c2ab3329cbc36103cb2bf  gcc-python-plugin-0.15.tar.gz