rpms/gtk2/devel gtk+-2.11.3-typename.patch, NONE, 1.1 gtk2.spec, 1.233, 1.234

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17271

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.11.3-typename.patch 
Log Message:
Resolves: rhbz#244516 avoid typename in headers for C++

gtk+-2.11.3-typename.patch:

--- NEW FILE gtk+-2.11.3-typename.patch ---
diff -ru gtk+-2.11.3/gtk/gtkbuilder.h gtk+-2.11.3/gtk/gtkbuilder.h
--- gtk+-2.11.3/gtk/gtkbuilder.h.typename	2007-06-16 17:36:17.000000000 +0100
+++ gtk+-2.11.3/gtk/gtkbuilder.h	2007-06-16 17:36:42.000000000 +0100
@@ -60,7 +60,7 @@
   GObjectClass parent_class;
   
   GType (* get_type_from_name) (GtkBuilder *builder,
-                                const char *typename);
+                                const char *type_name);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -103,7 +103,7 @@
                                                   const gchar  	*domain);
 const gchar* gtk_builder_get_translation_domain  (GtkBuilder   	*builder);
 GType        gtk_builder_get_type_from_name      (GtkBuilder   	*builder,
-                                                  const char   	*typename);
+                                                  const char   	*type_name);
 
 gboolean     gtk_builder_value_from_string       (GParamSpec   	*pspec,
                                                   const gchar  	*string,


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- gtk2.spec	16 Jun 2007 03:03:54 -0000	1.233
+++ gtk2.spec	16 Jun 2007 16:41:51 -0000	1.234
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 # use fam for recent-files
 #Patch2: gtk+-2.10.3-fam.patch
+Patch3: gtk+-2.11.3-typename.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -111,6 +112,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 #%patch2 -p1 -b .fam
+%patch3 -p2 -b .typename
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -278,6 +280,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sat Jun 16 2007 Caolan McNamara <caolanm at redhat.com> - 1.11.3-2
+- Resolves: rhbz#244516 avoid typename in headers for C++
+
 * Fri Jun 15 2007 Matthias Clasen <mclasen at redhat.com> - 1.11.3-1
 - Update to 2.11.3
 - Drop upstreamed patches