--- a/ChangeLog	Wed Sep 23 18:06:26 2009 +0000
+++ b/ChangeLog	Wed Sep 23 18:36:39 2009 +0000
@@ -1,3 +1,15 @@
+2009-09-23  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-python-libs.spe,c SUNWgnome-python26-libs.spec,
+	  patches/pygtksourceview-01-configure.diff:  Set
+	  PKG_CONFIG_TOP_BUILD_DIR environment variable when building
+	  pygtksourceview, which removes the need for the
+	  pygtksourceview-01-configure.diff patch, so remove it.
+	* patches/pygtksourceview-01-configure.diff, 
+	  patches/pygtksourceview-02-pygobject-xsl-dir.diff,
+	  patches/pygtksourceview-03-codegen-in-pygobject.diff:  Merge the
+	  02 and 03 patch into the single 01 patch
+
 2009-09-23  Willie Walker <[email protected]>
 
         * SUNWespeak.spec: Add patch to fix yet another hang (see

--- a/SUNWgnome-python-libs.spec	Wed Sep 23 18:06:26 2009 +0000
+++ b/SUNWgnome-python-libs.spec	Wed Sep 23 18:36:39 2009 +0000
@@ -108,7 +108,9 @@
 %gnome_python.build -d %name-%version
 
 export CFLAGS="`echo %optflags | sed -e 's/-xregs=no.frameptr//'`"
+export PKG_CONFIG_TOP_BUILD_DIR=%{_builddir}/%name-%version/pygtksourceview-%{pygtksourceview.version}
 %pygtksourceview.build -d %name-%version
+unset PKG_CONFIG_TOP_BUILD_DIR
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -176,6 +178,10 @@
 %{_prefix}/demo/jds/bin/pygtk-demo
 
 %changelog
+* Wed Sep 23 2009 - [email protected]
+- Use PKG_CONFIG_TOP_BUILD_DIR environment variable when building pygtk and
+  pygtksourceview, so that pkg-config expands $(top_builddir), otherwise
+  pygobject pkg-config variables do not expand nicely and the build fails.
 * Thu Jun 18 2009 - [email protected]
 - Fix moving lib around.
 * Mon Jun 15 2009 - [email protected]

--- a/SUNWgnome-python26-libs.spec	Wed Sep 23 18:06:26 2009 +0000
+++ b/SUNWgnome-python26-libs.spec	Wed Sep 23 18:36:39 2009 +0000
@@ -104,7 +104,9 @@
 %gnome_python.build -d %name-%version
 
 export CFLAGS="`echo %optflags | sed -e 's/-xregs=no.frameptr//'`"
+export PKG_CONFIG_TOP_BUILD_DIR=%{_builddir}/%name-%version/pygtksourceview-%{pygtksourceview.version}
 %pygtksourceview.build -d %name-%version
+unset PKG_CONFIG_TOP_BUILD_DIR
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -162,6 +164,10 @@
 %{_prefix}/demo/jds/bin/pygtk-demo-2.6
 
 %changelog
+* Wed Sep 23 2009 - [email protected]
+- Use PKG_CONFIG_TOP_BUILD_DIR environment variable when building pygtk and
+  pygtksourceview, so that pkg-config expands $(top_builddir), otherwise
+  pygobject pkg-config variables do not expand nicely and the build fails.
 * Sat Jun 20 2009 - [email protected]
 - Minor pkg'ing fix.
 * Wed Mar 25 2009 - [email protected]

--- a/base-specs/pygtksourceview.spec	Wed Sep 23 18:06:26 2009 +0000
+++ b/base-specs/pygtksourceview.spec	Wed Sep 23 18:36:39 2009 +0000
@@ -13,12 +13,8 @@
 Summary:             Python bindings for GtkSourceView 2
 Version:             2.8.0
 Source:              http://ftp.gnome.org/pub/GNOME/sources/pygtksourceview/2.8/pygtksourceview-%{version}.tar.bz2
-#owner:dcarbery date:2007-10-17 bugzilla:487565 type:bug
-Patch1:              pygtksourceview-01-skip-codegen-test.diff
 #owner:dcarbery date:2007-10-17 bugzilla:487525 type:bug
-Patch2:              pygtksourceview-02-pygobject-xsl-dir.diff
-#owner:laca date:2008-08-26 bugzilla:???? type:bug
-Patch3:              pygtksourceview-03-codegen-in-pygobject.diff
+Patch1:              pygtksourceview-01-pygobject-xsl-dir.diff
 URL:                 http://www.gnome.org
 SUNW_BaseDir:        %{_basedir}
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
@@ -33,8 +29,6 @@
 %prep
 %setup -q -n pygtksourceview-%version
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -78,6 +72,8 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Sep 23 2009 - [email protected]
+- Clean up patches.
 * Tue Sep 22 2009 - [email protected]
 - Bump to 2.8.0.
 * Thu Aug 27 2009 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pygtksourceview-01-configure.diff	Wed Sep 23 18:36:39 2009 +0000
@@ -0,0 +1,56 @@
+--- pygtksourceview-2.8.0/configure.ac-orig	2009-09-23 13:08:51.142485973 -0500
++++ pygtksourceview-2.8.0/configure.ac	2009-09-23 13:09:19.026688500 -0500
+@@ -74,6 +74,9 @@ AC_SUBST(PYGOBJECT_INCLUDEDIR)
+ PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir pygobject-2.0`
+ AC_SUBST(PYGOBJECT_DATADIR)
+ 
++PYGOBJECT_XSLFILES=`$PKG_CONFIG --variable=xslfiles pygobject-2.0`
++AC_SUBST(PYGOBJECT_XSLFILES)
++
+ PYGOBJECT_FIXXREF="$PYTHON `$PKG_CONFIG --variable=fixxref pygobject-2.0`"
+ AC_SUBST(PYGOBJECT_FIXXREF)
+ 
+@@ -113,10 +116,13 @@ PYGTK_DATADIR=`$PKG_CONFIG --variable=da
+ 
+ AC_SUBST(PYGTK_DATADIR)
+ 
++PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
++AC_SUBST(PYGTK_DEFSDIR)
++
+ 
+ dnl codegen
+ AC_MSG_CHECKING(for pygtk codegen)
+-CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
++CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
+ echo $CODEGENDIR
+ if test -f $CODEGENDIR/codegen.py; then
+ 	CODEGEN=$CODEGENDIR/codegen.py
+--- pygtksourceview-2.7.0.orig/Makefile.am	2009-08-27 21:14:06.455302476 +0100
++++ pygtksourceview-2.7.0/Makefile.am	2009-08-27 21:15:58.280856152 +0100
+@@ -44,9 +44,9 @@
+ 	(cd $(srcdir)\
+ 	&& $(PYTHON) $(CODEGEN)							\
+ 		--override $*.override						\
+-		--register @PYGTK_DATADIR@/pygtk/2.0/defs/gdk-types.defs	\
+-		--register @PYGTK_DATADIR@/pygtk/2.0/defs/pango-types.defs	\
+-		--register @PYGTK_DATADIR@/pygtk/2.0/defs/gtk-types.defs	\
++		--register @PYGTK_DEFSDIR@/gdk-types.defs \
++		--register @PYGTK_DEFSDIR@/pango-types.defs \
++		--register @PYGTK_DEFSDIR@/gtk-types.defs \
+ 		--prefix py$* $*.defs) > gen-$*.c				\
+ 		&& cp gen-$*.c $*.c						\
+ 		&& rm -f gen-$*.c
+diff -ruN pygtksourceview-2.7.0.orig/docs/Makefile.am pygtksourceview-2.7.0/docs/Makefile.am
+--- pygtksourceview-2.7.0.orig/docs/Makefile.am	2009-08-27 21:14:06.453578602 +0100
++++ pygtksourceview-2.7.0/docs/Makefile.am	2009-08-27 21:16:31.949134185 +0100
+@@ -3,8 +3,8 @@
+ REF_VERSION = $(PYGTKSOURCEVIEW_MAJOR_VERSION).$(PYGTKSOURCEVIEW_MINOR_VERSION)
+ FULL_VERSION = $(REF_VERSION).$(PYGTKSOURCEVIEW_MICRO_VERSION)
+ 
+-HTML_STYLE = $(PYGOBJECT_DATADIR)/pygobject/xsl/ref-html-style.xsl
+-PDF_STYLE = $(PYGOBJECT_DATADIR)/pygobject/xsl/pdf-style.xsl
++HTML_STYLE = $(PYGOBJECT_XSLFILES)/ref-html-style.xsl
++PDF_STYLE = $(PYGOBJECT_XSLFILES)/pdf-style.xsl
+ 
+ XMLFILES = 							\
+ 	reference/gtksourceview2-ref.xml			\

--- a/patches/pygtksourceview-02-pygobject-xsl-dir.diff	Wed Sep 23 18:06:26 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
---- pygtksourceview-2.0.0/configure.ac.orig	2007-10-17 15:07:19.674559330 +0100
-+++ pygtksourceview-2.0.0/configure.ac	2007-10-17 15:08:40.104547809 +0100
-@@ -71,6 +71,9 @@
- PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir pygobject-2.0`
- AC_SUBST(PYGOBJECT_DATADIR)
- 
-+PYGOBJECT_XSLFILES=`$PKG_CONFIG --variable=xslfiles pygobject-2.0`
-+AC_SUBST(PYGOBJECT_XSLFILES)
-+
- PYGOBJECT_FIXXREF="$PYTHON `$PKG_CONFIG --variable=fixxref pygobject-2.0`"
- AC_SUBST(PYGOBJECT_FIXXREF)
- 
-@@ -110,6 +113,9 @@
- 
- AC_SUBST(PYGTK_DATADIR)
- 
-+PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-+AC_SUBST(PYGTK_DEFSDIR)
-+
- 
- dnl codegen
- AC_MSG_CHECKING(for pygtk codegen)
-diff -ruN pygtksourceview-2.7.0.orig/Makefile.am pygtksourceview-2.7.0/Makefile.am
---- pygtksourceview-2.7.0.orig/Makefile.am	2009-08-27 21:14:06.455302476 +0100
-+++ pygtksourceview-2.7.0/Makefile.am	2009-08-27 21:15:58.280856152 +0100
-@@ -44,9 +44,9 @@
- 	(cd $(srcdir)\
- 	&& $(PYTHON) $(CODEGEN)							\
- 		--override $*.override						\
--		--register @PYGTK_DATADIR@/pygtk/2.0/defs/gdk-types.defs	\
--		--register @PYGTK_DATADIR@/pygtk/2.0/defs/pango-types.defs	\
--		--register @PYGTK_DATADIR@/pygtk/2.0/defs/gtk-types.defs	\
-+                --register @PYGTK_DEFSDIR@/gdk-types.defs \
-+                --register @PYGTK_DEFSDIR@/pango-types.defs \
-+                --register @PYGTK_DEFSDIR@/gtk-types.defs \
- 		--prefix py$* $*.defs) > gen-$*.c				\
- 		&& cp gen-$*.c $*.c						\
- 		&& rm -f gen-$*.c
-diff -ruN pygtksourceview-2.7.0.orig/docs/Makefile.am pygtksourceview-2.7.0/docs/Makefile.am
---- pygtksourceview-2.7.0.orig/docs/Makefile.am	2009-08-27 21:14:06.453578602 +0100
-+++ pygtksourceview-2.7.0/docs/Makefile.am	2009-08-27 21:16:31.949134185 +0100
-@@ -3,8 +3,8 @@
- REF_VERSION = $(PYGTKSOURCEVIEW_MAJOR_VERSION).$(PYGTKSOURCEVIEW_MINOR_VERSION)
- FULL_VERSION = $(REF_VERSION).$(PYGTKSOURCEVIEW_MICRO_VERSION)
- 
--HTML_STYLE = $(PYGOBJECT_DATADIR)/pygobject/xsl/ref-html-style.xsl
--PDF_STYLE = $(PYGOBJECT_DATADIR)/pygobject/xsl/pdf-style.xsl
-+HTML_STYLE = $(PYGOBJECT_XSLFILES)/ref-html-style.xsl
-+PDF_STYLE = $(PYGOBJECT_XSLFILES)/pdf-style.xsl
- 
- XMLFILES = 							\
- 	reference/gtksourceview2-ref.xml			\

--- a/patches/pygtksourceview-03-codegen-in-pygobject.diff	Wed Sep 23 18:06:26 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- pygtksourceview-2.3.0/configure.ac.orig	2008-08-26 08:10:00.801032637 +0100
-+++ pygtksourceview-2.3.0/configure.ac	2008-08-26 08:10:16.223598895 +0100
-@@ -119,7 +119,7 @@
- 
- dnl codegen
- AC_MSG_CHECKING(for pygtk codegen)
--CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
-+CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
- echo $CODEGENDIR
- 	CODEGEN=$CODEGENDIR/codegen.py
- 	AC_MSG_RESULT(yes)