--- a/ChangeLog	Thu Jun 18 14:13:32 2009 +0000
+++ b/ChangeLog	Thu Jun 18 14:20:02 2009 +0000
@@ -1,3 +1,10 @@
+2009-06-18  Christian Kelly  <[email protected]>
+
+	* patches/pygobject-02-sun-studio.diff: Remove, upstream.
+	* SUNWgnome-python-libs.spec: Fix moving lib.
+	* base-specs/gnome-python.spec: Bump to 2.27.1.
+	* base-specs/pygobject.spec: Bump to 2.18.0.
+
 2009-06-18  Matt Keenan <[email protected]>
 
 	* SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118

--- a/SUNWgnome-python-libs.spec	Thu Jun 18 14:13:32 2009 +0000
+++ b/SUNWgnome-python-libs.spec	Thu Jun 18 14:20:02 2009 +0000
@@ -136,7 +136,7 @@
 
 # move to subdir to avoid conflict with Python 2.5 and Python 2.6
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/pygobject
-mv $RPM_BUILD_ROOT%{_libdir}/libpyglib-2.0.so* \
+mv $RPM_BUILD_ROOT%{_libdir}/libpyglib-2.0-python2.4.so* \
    $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/pygobject
 mv $RPM_BUILD_ROOT%{_libdir}/pygtk \
    $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/pygobject
@@ -170,6 +170,8 @@
 %{_prefix}/demo/jds/bin/pygtk-demo
 
 %changelog
+* Thu Jun 18 2009 - [email protected]
+- Fix moving lib around.
 * Mon Jun 15 2009 - [email protected]
 - Use pycairo-1.4.spec to work with python2.4
 * Wed Mar 25 2009 - [email protected]

--- a/base-specs/gnome-python.spec	Thu Jun 18 14:13:32 2009 +0000
+++ b/base-specs/gnome-python.spec	Thu Jun 18 14:20:02 2009 +0000
@@ -10,7 +10,7 @@
 Name:			gnome-python
 License:		LGPL	
 Group:			System/Library
-Version:		2.26.1
+Version:		2.27.1
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -105,6 +105,8 @@
 %{_includedir}/*
 
 %changelog -n gnome-python
+* Thu Jun 18 2009 - [email protected]
+- Bump to 2.27.1.
 * Wed Apr 15 2009 - [email protected]
 - Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]

--- a/base-specs/pygobject.spec	Thu Jun 18 14:13:32 2009 +0000
+++ b/base-specs/pygobject.spec	Thu Jun 18 14:20:02 2009 +0000
@@ -10,7 +10,7 @@
 Name:			pygobject
 License:		LGPL	
 Group:			System/Library
-Version:		2.16.1
+Version:		2.18.0
 Release:		2
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -18,8 +18,6 @@
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.16/pygobject-%{version}.tar.bz2
 # owner:laca date:2008-08-26 type:bug
 Patch1:                 pygobject-01-uninstalled-pc.diff
-# owner:laca date:2008-09-12 type:bug
-Patch2:                 pygobject-02-sun-studio.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -59,7 +57,6 @@
 %prep
 %setup -q -n pygobject-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 %ifos solaris

--- a/patches/pygobject-02-sun-studio.diff	Thu Jun 18 14:13:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- pygobject-2.15.4/gobject/pygobject.c.orig	2008-09-12 11:02:29.535084029 +0100
-+++ pygobject-2.15.4/gobject/pygobject.c	2008-09-12 11:02:57.334465068 +0100
-@@ -419,7 +419,7 @@
-     0
- };
- 
--struct empty {} _empty;
-+struct empty { char dummy; } _empty;
- PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, _empty);
- 
- static PyObject *