- Update to 2.12.1
- Remove patch for RH bug #217430 (fixed upstream). - Remove patch for GNOME bug #479012 (fixed upstream).
This commit is contained in:
Matthew Barnes
parent
08c2a23c5f
commit
6ad6139ae0
@ -1 +1 @@
|
||||
pygtk-2.12.0.tar.bz2
|
||||
pygtk-2.12.1.tar.bz2
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
Index: gtk/gtktreeview.override
|
||||
===================================================================
|
||||
--- gtk/gtktreeview.override (revision 2907)
|
||||
+++ gtk/gtktreeview.override (working copy)
|
||||
@@ -3321,7 +3321,7 @@
|
||||
return Py_None;
|
||||
}
|
||||
%%
|
||||
-override gtk_tree_view_convert_widget_to_bin_window_coords args
|
||||
+override gtk_tree_view_convert_widget_to_bin_window_coords kwargs
|
||||
static PyObject*
|
||||
_wrap_gtk_tree_view_convert_widget_to_bin_window_coords(PyGObject *self,
|
||||
PyObject *args,
|
||||
@@ -3342,7 +3342,7 @@
|
||||
return Py_BuildValue("(ii)", window_x, window_y);
|
||||
}
|
||||
%%
|
||||
-override gtk_tree_view_convert_widget_to_tree_coords args
|
||||
+override gtk_tree_view_convert_widget_to_tree_coords kwargs
|
||||
static PyObject*
|
||||
_wrap_gtk_tree_view_convert_widget_to_tree_coords(PyGObject *self,
|
||||
PyObject *args,
|
||||
@@ -3363,7 +3363,7 @@
|
||||
return Py_BuildValue("(ii)", tree_x, tree_y);
|
||||
}
|
||||
%%
|
||||
-override gtk_tree_view_convert_tree_to_widget_coords args
|
||||
+override gtk_tree_view_convert_tree_to_widget_coords kwargs
|
||||
static PyObject*
|
||||
_wrap_gtk_tree_view_convert_tree_to_widget_coords(PyGObject *self,
|
||||
PyObject *args,
|
||||
@@ -3384,7 +3384,7 @@
|
||||
return Py_BuildValue("(ii)", widget_x, widget_y);
|
||||
}
|
||||
%%
|
||||
-override gtk_tree_view_convert_tree_to_bin_window_coords args
|
||||
+override gtk_tree_view_convert_tree_to_bin_window_coords kwargs
|
||||
static PyObject*
|
||||
_wrap_gtk_tree_view_convert_tree_to_bin_window_coords(PyGObject *self,
|
||||
PyObject *args,
|
||||
@@ -3405,7 +3405,7 @@
|
||||
return Py_BuildValue("(ii)", window_x, window_y);
|
||||
}
|
||||
%%
|
||||
-override gtk_tree_view_convert_bin_window_to_widget_coords args
|
||||
+override gtk_tree_view_convert_bin_window_to_widget_coords kwargs
|
||||
static PyObject*
|
||||
_wrap_gtk_tree_view_convert_bin_window_to_widget_coords(PyGObject *self,
|
||||
PyObject *args,
|
||||
@@ -3426,7 +3426,7 @@
|
||||
return Py_BuildValue("(ii)", widget_x, widget_y);
|
||||
}
|
||||
%%
|
||||
-override gtk_tree_view_convert_bin_window_to_tree_coords args
|
||||
+override gtk_tree_view_convert_bin_window_to_tree_coords kwargs
|
||||
static PyObject*
|
||||
_wrap_gtk_tree_view_convert_bin_window_to_tree_coords(PyGObject *self,
|
||||
PyObject *args,
|
||||
@ -1,22 +0,0 @@
|
||||
--- pygtk-2.11.0/gtk/Makefile.am.install-extrafuncs 2007-08-23 17:04:03.000000000 -0400
|
||||
+++ pygtk-2.11.0/gtk/Makefile.am 2007-08-27 13:49:07.000000000 -0400
|
||||
@@ -138,7 +138,7 @@ nodist__gtk_la_SOURCES = gtk.c gdk.c
|
||||
if BUILD_GTK
|
||||
pygtkexec_LTLIBRARIES += _gtk.la
|
||||
defs_DATA += $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \
|
||||
- gdk.defs gtk.defs gdk-types.defs gtk-types.defs
|
||||
+ gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs
|
||||
endif
|
||||
|
||||
# libglade module
|
||||
--- pygtk-2.11.0/gtk/Makefile.in.install-extrafuncs 2007-08-27 09:40:57.000000000 -0400
|
||||
+++ pygtk-2.11.0/gtk/Makefile.in 2007-08-27 13:50:26.000000000 -0400
|
||||
@@ -47,7 +47,7 @@ host_triplet = @host@
|
||||
@HAVE_GTK_2_12_TRUE@am__append_7 = gtk-2.12-types.defs
|
||||
@BUILD_GTK_TRUE@am__append_8 = _gtk.la
|
||||
@BUILD_GTK_TRUE@am__append_9 = $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \
|
||||
-@BUILD_GTK_TRUE@ gdk.defs gtk.defs gdk-types.defs gtk-types.defs
|
||||
+@BUILD_GTK_TRUE@ gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs
|
||||
|
||||
@BUILD_LIBGLADE_TRUE@am__append_10 = glade.la
|
||||
@BUILD_LIBGLADE_TRUE@am__append_11 = $(LIBGLADE_DEFS)
|
||||
17
pygtk2.spec
17
pygtk2.spec
@ -5,8 +5,8 @@
|
||||
### Abstract ###
|
||||
|
||||
Name: pygtk2
|
||||
Version: 2.12.0
|
||||
Release: 3%{?dist}
|
||||
Version: 2.12.1
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: Development/Languages
|
||||
Summary: Python bindings for GTK+
|
||||
@ -18,12 +18,6 @@ Source: pygtk-%{version}.tar.bz2
|
||||
|
||||
Patch0: pygtk-nodisplay-exception.patch
|
||||
|
||||
# RH bug #217430 / GNOME bug #380020
|
||||
Patch1: pygtk2-2.10.3-install-extrafuncs.patch
|
||||
|
||||
# fix segfault using treeview coordinate conversion methods (GNOME #479012)
|
||||
Patch2: pygtk-treeview-convert.patch
|
||||
|
||||
### Dependencies ###
|
||||
|
||||
Requires: gtk2 >= 2.9.4
|
||||
@ -93,8 +87,6 @@ This package contains documentation files for %{name}.
|
||||
%prep
|
||||
%setup -q -n pygtk-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1 -b .install-extrafuncs
|
||||
%patch2 -p0
|
||||
|
||||
%build
|
||||
%configure --enable-thread --enable-numpy
|
||||
@ -159,6 +151,11 @@ rm -fr $RPM_BUILD_ROOT
|
||||
%{_datadir}/gtk-doc/html/pygtk
|
||||
|
||||
%changelog
|
||||
* Thu Jan 03 2008 Matthew Barnes <mbarnes@redhat.com> - 2.12.1-1.fc9
|
||||
- Update to 2.12.1
|
||||
- Remove patch for RH bug #217430 (fixed upstream).
|
||||
- Remove patch for GNOME bug #479012 (fixed upstream).
|
||||
|
||||
* Fri Oct 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-3.fc8
|
||||
- Add subpackage pygtk2-doc to avoid multilib conflicts.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user