--- a/ChangeLog	Wed Sep 23 18:58:33 2009 +0000
+++ b/ChangeLog	Wed Sep 23 19:14:16 2009 +0000
@@ -1,3 +1,14 @@
+2009-09-23  Brian Cameron  <[email protected]>
+
+	* patches/pygtk2-01-uninstalled-pc.diff:  Clean up patch to
+	  reflect maintainers comments, so it can go upstream.
+	* base-specs/pygtk2.spec, base-specs/audiofile.spec,
+	  patches/pygtk2-01-uninstalled-pc.diff,
+	  patches/audiofile-01-unintsalled-pc.diff: Rename the
+	  patches so they are more consistent.  Also, remove hunk that
+	  is no longer needed from the pygtk2-01-uninstalled-pc.diff
+	  patch.
+	
 2009-09-23  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-python-libs.spe,c SUNWgnome-python26-libs.spec,

--- a/base-specs/audiofile.spec	Wed Sep 23 18:58:33 2009 +0000
+++ b/base-specs/audiofile.spec	Wed Sep 23 19:14:16 2009 +0000
@@ -22,7 +22,7 @@
 # Note - I sent this patch to the maintainer and he agreed to accept it
 # into their next build.  There is no bug tracking system for this module.
 #owner:yippi date:2004-02-25 type:feature
-Patch1:       audiofile-01-uninstalled.pc.diff
+Patch1:       audiofile-01-uninstalled-pc.diff
 URL:          http://www.68k.org/~michael/audiofile/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}

--- a/base-specs/pygtk2.spec	Wed Sep 23 18:58:33 2009 +0000
+++ b/base-specs/pygtk2.spec	Wed Sep 23 19:14:16 2009 +0000
@@ -20,7 +20,7 @@
 Summary:		Python bindings for GTK+
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.16/pygtk-%{version}.tar.bz2
 # date:2005-10-27 owner:dcarbery type:feature bugzilla:385131
-Patch1:                 pygtk2-01-uninstalled.pc.diff
+Patch1:                 pygtk2-01-uninstalled-pc.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/audiofile-01-uninstalled-pc.diff	Wed Sep 23 19:14:16 2009 +0000
@@ -0,0 +1,19 @@
+--- /dev/null	2007-02-28 22:23:33.000000000 -0500
++++ audiofile-0.2.6/audiofile-uninstalled.pc.in	2007-02-28 22:28:09.585724000 -0500
+@@ -0,0 +1,6 @@
++Name: audiofile
++Description: audiofile
++Requires:
++Version: @VERSION@
++Libs: ${pc_top_builddir}/${pcfiledir}/libaudiofile/libaudiofile.la -lm
++Cflags: -I${pc_top_builddir}/${pcfiledir}/libaudiofile
+--- audiofile-0.2.6/configure.in.orig	2007-02-28 22:28:55.782024000 -0500
++++ audiofile-0.2.6/configure.in	2007-02-28 22:29:14.326955000 -0500
+@@ -94,6 +94,7 @@
+ AC_OUTPUT([
+ 	audiofile.spec
+ 	audiofile.pc
++	audiofile-uninstalled.pc
+ 	sfcommands/Makefile 
+ 	test/Makefile 
+ 	examples/Makefile 

--- a/patches/audiofile-01-uninstalled.pc.diff	Wed Sep 23 18:58:33 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2007-02-28 22:23:33.000000000 -0500
-+++ audiofile-0.2.6/audiofile-uninstalled.pc.in	2007-02-28 22:28:09.585724000 -0500
-@@ -0,0 +1,6 @@
-+Name: audiofile
-+Description: audiofile
-+Requires:
-+Version: @VERSION@
-+Libs: ${pc_top_builddir}/${pcfiledir}/libaudiofile/libaudiofile.la -lm
-+Cflags: -I${pc_top_builddir}/${pcfiledir}/libaudiofile
---- audiofile-0.2.6/configure.in.orig	2007-02-28 22:28:55.782024000 -0500
-+++ audiofile-0.2.6/configure.in	2007-02-28 22:29:14.326955000 -0500
-@@ -94,6 +94,7 @@
- AC_OUTPUT([
- 	audiofile.spec
- 	audiofile.pc
-+	audiofile-uninstalled.pc
- 	sfcommands/Makefile 
- 	test/Makefile 
- 	examples/Makefile 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pygtk2-01-uninstalled-pc.diff	Wed Sep 23 19:14:16 2009 +0000
@@ -0,0 +1,33 @@
+--- pygtk-2.9.0/configure.ac.orig	Wed Apr  5 12:08:40 2006
++++ pygtk-2.9.0/configure.ac	Wed Apr  5 12:10:24 2006
+@@ -369,6 +369,7 @@
+ AC_CONFIG_FILES(
+   Makefile
+   pygtk-2.0.pc
++  pygtk-2.0-uninstalled.pc
+   pygtk-codegen-2.0
+   gtk/Makefile
+   docs/Makefile
+--- /dev/null	2009-09-23 13:25:06.000000000 -0500
++++ pygtk-2.16.0/pygtk-2.0-uninstalled.pc.in	2009-09-23 13:41:21.127592383 -0500
+@@ -0,0 +1,20 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++includedir=@includedir@
++datarootdir=@datarootdir@
++datadir=@datadir@
++pyexecdir=@pyexecdir@
++
++# you can use the --variable=pygtkincludedir argument to
++# pkg-config to get this value.  You might want to use this to
++# install additional headers.
++pygtkincludedir=${includedir}/pygtk-2.0
++
++# same here.  Useful when calling the code generator in addon packages.
++defsdir=${pc_top_builddir}/${pcfiledir}
++
++Name: PyGTK
++Description: Python bindings for GTK+ and related libraries
++Requires: pygobject-2.0
++Version: @VERSION@
++Cflags: -I${pc_top_builddir}/${pcfiledir}/. @THREADING_CFLAGS@

--- a/patches/pygtk2-01-uninstalled.pc.diff	Wed Sep 23 18:58:33 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
---- pygtk-2.9.0/configure.ac.orig	Wed Apr  5 12:08:40 2006
-+++ pygtk-2.9.0/configure.ac	Wed Apr  5 12:10:24 2006
-@@ -369,6 +369,7 @@
- AC_CONFIG_FILES(
-   Makefile
-   pygtk-2.0.pc
-+  pygtk-2.0-uninstalled.pc
-   pygtk-codegen-2.0
-   gtk/Makefile
-   docs/Makefile
---- /dev/null	2005-10-27 18:34:42.000000000 -0400
-+++ pygtk-2.7.4/pygtk-2.0-uninstalled.pc.in	2005-10-27 18:26:08.995301000 -0400
-@@ -0,0 +1,21 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+includedir=@includedir@
-+datarootdir=@datarootdir@
-+datadir=@datadir@
-+pyexecdir=@pyexecdir@
-+
-+# you can use the --variable=pygtkincludedir argument to
-+# pkg-config to get this value.  You might want to use this to
-+# install additional headers.
-+pygtkincludedir=${includedir}/pygtk-2.0
-+
-+# same here.  Useful when calling the code generator in addon packages.
-+defsdir=${pc_top_builddir}/${pcfiledir}
-+codegendir=${pc_top_builddir}/${pcfiledir}/codegen
-+
-+Name: PyGTK
-+Description: Python bindings for GTK+ and related libraries
-+Requires: pygobject-2.0
-+Version: @VERSION@
-+Cflags: -I${pc_top_builddir}/${pcfiledir}/. @THREADING_CFLAGS@
---- pygtk-2.9.3/gtk/gtkunixprint.override.orig	2006-07-27 18:15:04.469619000 +0100
-+++ pygtk-2.9.3/gtk/gtkunixprint.override	2006-07-27 18:15:11.900304000 +0100
-@@ -105,11 +105,7 @@
-     if (pyg_error_check(&error))
-         return NULL;
- 
--#if PYCAIRO_VERSION_HEX >= 0x1010600
-     return PycairoSurface_FromSurface(surface, NULL);
--#else
--    return PycairoSurface_FromSurface(surface, NULL, NULL);
--#endif
- }
- %%
- override gtk_print_job_send kwargs