--- a/ChangeLog	Wed Oct 17 11:04:24 2007 +0000
+++ b/ChangeLog	Wed Oct 17 16:43:33 2007 +0000
@@ -1,3 +1,13 @@
+2007-10-16  Damien Carbery <[email protected]>
+
+	* base-specs/pygtksourceview.spec: Call autoconf because configure.ac
+	  is being patched.
+	* patches/pygtksourceview-02-pygobject-xsl-dir.diff: Use new pygobject
+	  .pc file variables to enable the module for uninstalled building.
+	  Bugzilla 487525.
+	* patches/pygobject-02-pc-file.diff: Add 'xslfiles' variable for use
+	  by pygtksourceview. bugzilla 487523.
+
 2007-10-16  Matt Keenan <[email protected]>
 
 	* base-specs/rarian.spec : Add patch rarian-01-reg-return.diff to fix

--- a/base-specs/pygobject.spec	Wed Oct 17 11:04:24 2007 +0000
+++ b/base-specs/pygobject.spec	Wed Oct 17 16:43:33 2007 +0000
@@ -18,7 +18,7 @@
 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:?????? type:bug
+#owner:dcarbery date:2007-10-16 bugzilla:487523 type:bug
 Patch2:                 pygobject-02-pc-file.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build

--- a/base-specs/pygtksourceview.spec	Wed Oct 17 11:04:24 2007 +0000
+++ b/base-specs/pygtksourceview.spec	Wed Oct 17 16:43:33 2007 +0000
@@ -10,7 +10,9 @@
 Summary:             Python bindings for GtkSourceView 2
 Version:             2.0.0
 Source:              http://ftp.gnome.org/pub/GNOME/sources/pygtksourceview/2.0/pygtksourceview-%{version}.tar.bz2
+#owner:dcarbery date:2007-10-17 bugzilla:?????? 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
 URL:                 http://www.gnome.org
 SUNW_BaseDir:        %{_basedir}
@@ -37,6 +39,7 @@
 export CFLAGS="%optflags"
 export LDFLAGS="%_ldflags"
 
+autoconf
 ./configure --prefix=%{_prefix}  \
 	     %{gtk_doc_option}   \
             --sysconfdir=%{_sysconfdir}
@@ -67,6 +70,8 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Oct 17 2007 - [email protected]
+- Call autoconf because configure.ac is being patched.
 * Sun Oct 07 2007 - [email protected]
 - Add patches, 01-skip-codegen-test and 02-pygobject-xsl-dir, to get the module
   to build within the JDS environment where pygobject and pygtk are not yet

--- a/patches/pygtksourceview-02-pygobject-xsl-dir.diff	Wed Oct 17 11:04:24 2007 +0000
+++ b/patches/pygtksourceview-02-pygobject-xsl-dir.diff	Wed Oct 17 16:43:33 2007 +0000
@@ -1,16 +1,3 @@
---- pygtksourceview-1.90.4/docs/Makefile.am.orig	2007-10-05 19:20:55.473628738 +0100
-+++ pygtksourceview-1.90.4/docs/Makefile.am	2007-10-05 19:22:21.615369900 +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_DATADIR)/docs/xsl/ref-html-style.xsl
-+PDF_STYLE = ../$(PYGOBJECT_DATADIR)/docs/xsl/pdf-style.xsl
- 
- XMLFILES = 														\
-     reference/gtksourceview2-ref.xml							\
 --- pygtksourceview-2.0.0/Makefile.am.orig	2007-10-07 15:07:27.540907063 +0100
 +++ pygtksourceview-2.0.0/Makefile.am	2007-10-07 15:08:22.752016163 +0100
 @@ -39,9 +39,9 @@
@@ -20,9 +7,44 @@
 -	    --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-2.12.0/gdk-types.defs \
-+	    --register ../pygtk-2.12.0/pango-types.defs \
-+	    --register ../pygtk-2.12.0/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
+--- pygtksourceview-2.0.0/docs/Makefile.am.orig	2007-10-17 14:01:13.173895268 +0100
++++ pygtksourceview-2.0.0/docs/Makefile.am	2007-10-17 14:01:45.718234596 +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							\
+--- 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)