rpms/pygtk2/devel pygtk-2.9.3-crazy-reload-hack.patch, NONE, 1.1 pygtk.spec, 1.59, 1.60

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18457

Modified Files:
	pygtk.spec 
Added Files:
	pygtk-2.9.3-crazy-reload-hack.patch 
Log Message:
* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 2.9.3-3
- Make sure reloading the gtk module works
- Fixes system-config-display (#199629)



pygtk-2.9.3-crazy-reload-hack.patch:
 __init__.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- NEW FILE pygtk-2.9.3-crazy-reload-hack.patch ---
--- pygtk-2.9.3/gtk/__init__.py.crazy-reload-hack	2006-07-27 21:46:37.000000000 -0400
+++ pygtk-2.9.3/gtk/__init__.py	2006-07-27 21:47:03.000000000 -0400
@@ -34,6 +34,20 @@
 if not hasattr(sys, 'argv'):
     sys.argv = []
 
+#crazy hack for reloading the gtk module
+if sys.modules.has_key ('gtk.deprecation'):
+    _Deprecated = sys.modules['gtk.deprecation']._Deprecated
+    _DeprecatedConstant = sys.modules['gtk.deprecation']._DeprecatedConstant
+
+if sys.modules.has_key ('gobject._gobject'):
+    _gobject = sys.modules['gobject._gobject']
+
+if sys.modules.has_key ('gtk._gtk'):
+    _gtk = sys.modules['gtk._gtk']
+
+if sys.modules.has_key ('gtk._lazyutils'):
+    _lazyutils = sys.modules['gtk._lazyutils']
+
 # load the required modules:
 import gobject as _gobject
 


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pygtk.spec	19 Jul 2006 21:32:05 -0000	1.59
+++ pygtk.spec	28 Jul 2006 01:56:55 -0000	1.60
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.3
-Release: 2
+Release: 3
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 
 Patch0: pygtk-2.9.2-use-complete-include-path.patch
 Patch1: pygtk-2.9.3-init.patch
+Patch2: pygtk-2.9.3-crazy-reload-hack.patch
 
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
@@ -59,6 +60,7 @@
 %setup -q -n pygtk-%{version}
 %patch0 -p1 -b .use-complete-include-path
 %patch1 -p1
+%patch2 -p1 -b .crazy-reload-hack
 
 %build
 %configure --enable-thread --enable-numpy
@@ -117,6 +119,10 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 2.9.3-3
+- Make sure reloading the gtk module works
+- Fixes system-config-display (#199629)
+
 * Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 2.9.3-2
 - Revert to previous behavior of raising an error if $DISPLAY cannot be
   opened.