--- a/ChangeLog	Fri Jan 04 19:05:45 2008 +0000
+++ b/ChangeLog	Fri Jan 04 19:25:35 2008 +0000
@@ -1,5 +1,9 @@
 2008-01-04  Damien Carbery <[email protected]>
 
+	* base-specs/pygobject.spec: Bump to 2.14.1. Remove upstream patch,
+	  01-uninst-datadir; rename rest.
+	* patches/pygobject-01-uninst-datadir.diff: Removed, upstream.
+	* patches/pygobject-01-pc-file.diff: Renamed from 02.
 	* base-specs/pygtk2.spec: Bump to 2.12.1.
 	* base-specs/blueprint.spec, base-specs/gnome-backgrounds.spec,
 	  base-specs/nautilus.spec, base-specs/nimbus.spec,

--- a/base-specs/pygobject.spec	Fri Jan 04 19:05:45 2008 +0000
+++ b/base-specs/pygobject.spec	Fri Jan 04 19:25:35 2008 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package pygobject
 #
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,16 +10,14 @@
 Name:			pygobject
 License:		LGPL	
 Group:			System/Library
-Version:		2.14.0
+Version:		2.14.1
 Release:		2
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
 Summary:		Python bindings for GObject
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-%{version}.tar.bz2
-#owner:dcarbery date:2007-10-07 bugzilla:486876 type:bug state:upstream
-Patch1:                 pygobject-01-uninst-datadir.diff
 #owner:dcarbery date:2007-10-16 bugzilla:487523 type:bug
-Patch2:                 pygobject-02-pc-file.diff
+Patch1:                 pygobject-01-pc-file.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
@@ -105,6 +102,9 @@
 %{_datadir}/pygobject/*
 
 %changelog -n pygobject
+* Fri Jan 04 2008 - [email protected]
+- Bump to 2.14.1. Remove upstream patch, 01-uninst-datadir; rename rest.
+
 * Tue Oct 16 2007 - [email protected]
 - Add patch, 02-pc-file, to add entries to the pc files to support building
   against the uninstalled module.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pygobject-01-pc-file.diff	Fri Jan 04 19:25:35 2008 +0000
@@ -0,0 +1,26 @@
+--- pygobject-2.14.0/pygobject-2.0.pc.in.orig	Tue Oct 16 14:42:44 2007
++++ pygobject-2.14.0/pygobject-2.0.pc.in	Tue Oct 16 14:45:39 2007
+@@ -11,6 +11,7 @@
+ pygtkincludedir=${includedir}/pygtk-2.0
+ fixxref=${datadir}/pygobject/xsl/fixxref.py
+ pygdocs=${datadir}/gtk-doc/html/pygobject
++xslfiles=${datadir}/pygobject/xsl
+ 
+ Name: PyGObject
+ Description: Python bindings for GObject
+--- pygobject-2.14.0/pygobject-2.0-uninstalled.pc.in.orig	Tue Oct 16 14:58:16 2007
++++ pygobject-2.14.0/pygobject-2.0-uninstalled.pc.in	Tue Oct 16 14:58:08 2007
+@@ -9,10 +9,11 @@
+ # pkg-config to get this value.  You might want to use this to
+ # install additional headers.
+ pygtkincludedir=${pc_top_builddir}/${pcfiledir}/gobject
++xslfiles=${pc_top_builddir}/${pcfiledir}/docs/xsl
+ 
+ # same here.  Useful when calling the code generator in addon packages.
+ defsdir=${pc_top_builddir}/${pcfiledir}/.
+-fixxref=${pc_top_builddir}/pygobject-@VERSION@/docs/xsl/fixxref.py
++fixxref=${pc_top_builddir}/${pcfiledir}/docs/xsl/fixxref.py
+ codegendir=${pc_top_builddir}/${pcfiledir}/gobject/codegen
+-pygdocs=${pc_top_builddir}/pygobject-@VERSION@/docs
++pygdocs=${pc_top_builddir}/${pcfiledir}/docs
+ datadir=${pc_top_builddir}/pygobject-@VERSION@

--- a/patches/pygobject-01-uninst-datadir.diff	Fri Jan 04 19:05:45 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
---- pygobject-2.13.2/pygobject-2.0-uninstalled.pc.in.orig	2007-10-05 19:24:02.521602900 +0100
-+++ pygobject-2.13.2/pygobject-2.0-uninstalled.pc.in	2007-10-05 19:25:08.095573400 +0100
-@@ -15,3 +15,4 @@
- fixxref=${pc_top_builddir}/pygobject-@VERSION@/docs/xsl/fixxref.py
- codegendir=${pc_top_builddir}/${pcfiledir}/gobject/codegen
- pygdocs=${pc_top_builddir}/pygobject-@VERSION@/docs
-+datadir=${pc_top_builddir}/pygobject-@VERSION@

--- a/patches/pygobject-02-pc-file.diff	Fri Jan 04 19:05:45 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- pygobject-2.14.0/pygobject-2.0.pc.in.orig	Tue Oct 16 14:42:44 2007
-+++ pygobject-2.14.0/pygobject-2.0.pc.in	Tue Oct 16 14:45:39 2007
-@@ -11,6 +11,7 @@
- pygtkincludedir=${includedir}/pygtk-2.0
- fixxref=${datadir}/pygobject/xsl/fixxref.py
- pygdocs=${datadir}/gtk-doc/html/pygobject
-+xslfiles=${datadir}/pygobject/xsl
- 
- Name: PyGObject
- Description: Python bindings for GObject
---- pygobject-2.14.0/pygobject-2.0-uninstalled.pc.in.orig	Tue Oct 16 14:58:16 2007
-+++ pygobject-2.14.0/pygobject-2.0-uninstalled.pc.in	Tue Oct 16 14:58:08 2007
-@@ -9,10 +9,11 @@
- # pkg-config to get this value.  You might want to use this to
- # install additional headers.
- pygtkincludedir=${pc_top_builddir}/${pcfiledir}/gobject
-+xslfiles=${pc_top_builddir}/${pcfiledir}/docs/xsl
- 
- # same here.  Useful when calling the code generator in addon packages.
- defsdir=${pc_top_builddir}/${pcfiledir}/.
--fixxref=${pc_top_builddir}/pygobject-@VERSION@/docs/xsl/fixxref.py
-+fixxref=${pc_top_builddir}/${pcfiledir}/docs/xsl/fixxref.py
- codegendir=${pc_top_builddir}/${pcfiledir}/gobject/codegen
--pygdocs=${pc_top_builddir}/pygobject-@VERSION@/docs
-+pygdocs=${pc_top_builddir}/${pcfiledir}/docs
- datadir=${pc_top_builddir}/pygobject-@VERSION@