--- a/ChangeLog	Thu Jan 10 12:37:01 2008 +0000
+++ b/ChangeLog	Thu Jan 10 15:41:02 2008 +0000
@@ -1,3 +1,13 @@
+2008-01-10  Damien Carbery <[email protected]>
+
+	* SUNWgnome-system-tools.spec, SUNWgnome-archive-mgr.spec: Add
+	  gnome-vfs info to CFLAGS and LDFLAGS as configure no longer retrieves
+	  them with pkg-config (libnautilus-extension depends on gio instead of
+	  gnome-vfs).
+	* base-specs/GConf.spec: Add upstream patch 04-glib-pc to fix
+	  gconf-2.0.pc file type: s/glib/glib-2.0/.
+	* patches/GConf-04-glib-pc.diff: Added to fix typo in gconf-2.0.pc.
+
 2008-01-10  Damien Carbery <[email protected]>
 
 	* SUNWlibgtop.spec: Set ACLOCAL_FLAGS to pick up the modified

--- a/SUNWgnome-archive-mgr.spec	Thu Jan 10 12:37:01 2008 +0000
+++ b/SUNWgnome-archive-mgr.spec	Thu Jan 10 15:41:02 2008 +0000
@@ -58,10 +58,10 @@
 gzcat %SOURCE0 | tar xf -
 
 %build
-export CFLAGS="%optflags"
+export CFLAGS="%optflags -I%{_includedir}/gnome-vfs-2.0 -I%{_libdir}/gnome-vfs-2.0/include"
 export RPM_OPT_FLAGS="$CFLAGS"
 export PKG_CONFIG_PATH=%{_pkg_config_path}
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags -L%{_libdir} -lgnomevfs-2"
 
 %froller.build -d %name-%version
 
@@ -157,6 +157,10 @@
 %{_sysconfdir}/gconf/schemas/file-roller.schemas
 
 %changelog
+* Thu Jan 10 2008 - [email protected]
+- Add gnome-vfs info to CFLAGS and LDFLAGS as configure no longer retrieves
+  them with pkg-config (libnautilus-extension depends on gio instead of
+  gnome-vfs).
 * Thu Jan  3 2008 - [email protected]
 - use gconf-install.script instead of an inline script
 * Tue Apr 24 2007 - [email protected]

--- a/SUNWgnome-system-tools.spec	Thu Jan 10 12:37:01 2008 +0000
+++ b/SUNWgnome-system-tools.spec	Thu Jan 10 15:41:02 2008 +0000
@@ -73,8 +73,9 @@
 
 %build
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal -I %{_builddir}/%{name}-%{version}/%{systemtoolsbackends.name}-%{systemtoolsbackends.version}/m4macros"
-export LDFLAGS="%_ldflags"
-export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags -L%{_libdir} -lgnomevfs-2"
+export CFLAGS="%optflags -I%{_includedir}/gnome-vfs-2.0 -I%{_libdir}/gnome-vfs-2.0/include"
+export RPM_OPT_FLAGS="$CFLAGS"
 export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{version}/%{systemtoolsbackends.name}-%{systemtoolsbackends.version}:%{_pkg_config_path}
 %systemtoolsbackends.build -d %name-%version
 %gnomesystemtools.build -d %name-%version
@@ -199,6 +200,10 @@
 %config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
 
 %changelog
+* Thu Jan 10 2008 - [email protected]
+- Add gnome-vfs info to CFLAGS and LDFLAGS as configure no longer retrieves
+  them with pkg-config (libnautilus-extension depends on gio instead of
+  gnome-vfs).
 * Thu Jan  3 2008 - [email protected]
 - use gconf-install.script instead of an inline script
 * Thu Oct 11 2007 - [email protected]

--- a/base-specs/GConf.spec	Thu Jan 10 12:37:01 2008 +0000
+++ b/base-specs/GConf.spec	Thu Jan 10 15:41:02 2008 +0000
@@ -23,6 +23,8 @@
 Patch2:       GConf-02-g11n-locale-alias.diff
 #owner:laca date:2006-06-29 type:feature
 Patch3:       GConf-03-GCONF_BACKEND_DIR.diff
+#owner:dcarbery date:2008-01-10 type:bug state:upstream
+Patch4:       GConf-04-glib-pc.diff
 URL:	      http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
@@ -64,6 +66,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %ifos linux
@@ -142,6 +145,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 10 2008 - [email protected]
+- Add patch 04-glib-pc to fix gconf-2.0.pc file type: s/glib/glib-2.0/.
 * Wed Jan 09 2008 - [email protected]
 - Bump to 2.21.1. Remove upstream patch, 02-daemon-hanged-solaris, rename
   remainder.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/GConf-04-glib-pc.diff	Thu Jan 10 15:41:02 2008 +0000
@@ -0,0 +1,11 @@
+--- GConf-2.21.1/gconf-2.0.pc.in.orig	2008-01-10 15:28:25.048246705 +0000
++++ GConf-2.21.1/gconf-2.0.pc.in	2008-01-10 15:28:54.273554942 +0000
+@@ -8,7 +8,7 @@
+ Name: gconf
+ Description: GNOME Config System.
+ Version: @VERSION@
+-Requires: glib
++Requires: glib-2.0 gthread-2.0
+ Requires.private: ORBit-2.0
+ Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
+ Cflags: -I${includedir}/gconf/@MAJOR_VERSION@