[gcc-python-plugin/f16] fix include paths against gcc-4.6.1-7.fc16 onwards (rhbz#728011)

[dmalcolm]

commit 85f7267a5018bd2c38f93425b5c6a8696866ea8a
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Mon Sep 19 19:52:14 2011 -0400

    fix include paths against gcc-4.6.1-7.fc16 onwards (rhbz#728011)
    
    * Mon Sep 19 2011 David Malcolm <dmalcolm at redhat.com> - 0.6-2
    - fix include paths against gcc-4.6.1-7.fc16 onwards (rhbz#728011)

 gcc-python-plugin-0.6-fix-c-common-path.patch |   24 ++++++++++++++++++++++++
 gcc-python-plugin.spec                        |   12 ++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/gcc-python-plugin-0.6-fix-c-common-path.patch b/gcc-python-plugin-0.6-fix-c-common-path.patch
new file mode 100644
index 0000000..0770908
--- /dev/null
+++ b/gcc-python-plugin-0.6-fix-c-common-path.patch
@@ -0,0 +1,24 @@
+diff -up gcc-python-plugin-0.6/gcc-python-option.c.fix-c-common-path gcc-python-plugin-0.6/gcc-python-option.c
+--- gcc-python-plugin-0.6/gcc-python-option.c.fix-c-common-path	2011-09-19 19:39:47.300194707 -0400
++++ gcc-python-plugin-0.6/gcc-python-option.c	2011-09-19 19:40:16.930193892 -0400
+@@ -20,7 +20,7 @@
+ #include <Python.h>
+ #include "gcc-python.h"
+ #include "gcc-python-wrappers.h"
+-#include "c-common.h" /* for warn_format */
++#include "c-family/c-common.h" /* for warn_format */
+ #include "diagnostic.h"
+ 
+ 
+diff -up gcc-python-plugin-0.6/generate-tree-c.py.fix-c-common-path gcc-python-plugin-0.6/generate-tree-c.py
+--- gcc-python-plugin-0.6/generate-tree-c.py.fix-c-common-path	2011-09-19 19:40:06.051194201 -0400
++++ gcc-python-plugin-0.6/generate-tree-c.py	2011-09-19 19:40:23.386193716 -0400
+@@ -30,7 +30,7 @@ cu.add_include('gcc-plugin.h')
+ cu.add_include("tree.h")
+ cu.add_include("function.h")
+ cu.add_include("basic-block.h")
+-cu.add_include("c-common.h")
++cu.add_include("c-family/c-common.h")
+ 
+ modinit_preinit = ''
+ modinit_postinit = ''
diff --git a/gcc-python-plugin.spec b/gcc-python-plugin.spec
index 3a64249..cc01608 100644
--- a/gcc-python-plugin.spec
+++ b/gcc-python-plugin.spec
@@ -1,12 +1,17 @@
 Name:           gcc-python-plugin
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?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
+
+# Change the path of "c-common.h" to "c-family/c-common.h" to match the
+# change seen in rhbz#728011 (gcc-4.6.1-7.fc16 onwards):
+Patch1: gcc-python-plugin-0.6-fix-c-common-path.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-plugin-devel
@@ -87,7 +92,7 @@ This package contains API documentation for the GCC Python plugin
 
 %prep
 %setup -q
-
+%patch1 -p1 -b .fix-c-common-path
 
 %build
 
@@ -333,6 +338,9 @@ CheckPlugin \
 %doc examples
 
 %changelog
+* Mon Sep 19 2011 David Malcolm <dmalcolm at redhat.com> - 0.6-2
+- fix include paths against gcc-4.6.1-7.fc16 onwards (rhbz#728011)
+
 * Tue Aug  2 2011 David Malcolm <dmalcolm at redhat.com> - 0.6-1
 - 0.6