--- a/ChangeLog	Wed Feb 25 13:43:18 2004 +0000
+++ b/ChangeLog	Wed Feb 25 16:13:43 2004 +0000
@@ -1,3 +1,8 @@
+2004-02-25  Niall Power  <[email protected]>
+
+	* gnome-vfs.spec: add patch 12, *-uninstalled.pc files
+	* patches/gnome-vfs-12-uninstalled_pc.diff: added
+
 2004-02-25  Niall Power  <[email protected]>
 
 	* libglade.spec: cinnabar needs automake >= 2.54 so use the

--- a/Solaris/ChangeLog	Wed Feb 25 13:43:18 2004 +0000
+++ b/Solaris/ChangeLog	Wed Feb 25 16:13:43 2004 +0000
@@ -1,3 +1,8 @@
+2004-02-26  Niall Power <[email protected]>
+
+	* SUNWgnome-vfs.spec: remove sym link build hacks and 
+	  add -R%{_libdir} to LDFLAGS
+
 2004-02-26  Laszlo Peter  <[email protected]>
 
 	* SUNWgnome-component.spec: add -R%{_libdir} to LDFLAGS

--- a/Solaris/SUNWgnome-vfs.spec	Wed Feb 25 13:43:18 2004 +0000
+++ b/Solaris/SUNWgnome-vfs.spec	Wed Feb 25 16:13:43 2004 +0000
@@ -59,12 +59,9 @@
 %gvfs.prep -d %name-%version
 %gvfsx.prep -d %name-%version
 
-# FIXME: add a *-uninstalled.pc file to gnome-vfs instead
-cd gnome-vfs-extras-%{gvfsx.version}
-ln -s ../gnome-vfs-%{gvfs.version}/libgnomevfs .
-
 %build
 export PKG_CONFIG_PATH=../gnome-mime-data-%{gmdata.version}:../gnome-vfs-%{gvfs.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export LDFLAGS="-L%{_libdir} -R%{_libdir}"
 export MSGFMT="/usr/bin/msgfmt"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
@@ -125,6 +122,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Feb 25 2004 - [email protected]
+- remove sym link build hacks and add -R{_libdir
+  to LDFLAGS
 * Mon Feb 23 2004 - [email protected]
 - install gconf schemas at end of install stage.
 * Mon Jan 26 2004 - [email protected]

--- a/gnome-vfs.spec	Wed Feb 25 13:43:18 2004 +0000
+++ b/gnome-vfs.spec	Wed Feb 25 16:13:43 2004 +0000
@@ -20,6 +20,7 @@
 Patch9:       gnome-vfs-09-vfolder-permissions.diff
 Patch10:      gnome-vfs-10-system-settings-uri.diff
 Patch11:      gnome-vfs-11-this-comp-and-hotplug-names.diff
+Patch12:      gnome-vfs-12-uninstalled_pc.diff
 URL:          http://www.gnome.org/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
@@ -85,6 +86,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 bzcat %SOURCE1 | tar xvf -
 
@@ -160,6 +162,9 @@
 
 %changelog
 * Wed Feb 25 2004 - [email protected]
+- add patch 12 for uninstalled .pc files
+
+* Wed Feb 25 2004 - [email protected]
 - remove unnecessary %{_datadir}/aclocal arg from aclocal line.
 
 * Tue Feb 24 2004 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-vfs-12-uninstalled_pc.diff	Wed Feb 25 16:13:43 2004 +0000
@@ -0,0 +1,41 @@
+--- gnome-vfs-2.5.7/configure.in	2004-02-11 08:34:02.000000000 +0000
++++ gnome-vfs-2.5.7.new/configure.in	2004-02-25 15:17:16.000000000 +0000
+@@ -732,6 +732,8 @@
+ doc/version.xml
+ gnome-vfs-2.0.pc
+ gnome-vfs-module-2.0.pc
++gnome-vfs-2.0-uninstalled.pc
++gnome-vfs-module-2.0-uninstalled.pc
+ ])
+ 
+ chmod u+x test/vfs-run
+--- gnome-vfs-2.5.7/gnome-vfs-2.0-uninstalled.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-vfs-2.5.7.new/gnome-vfs-2.0-uninstalled.pc.in	2004-02-25 15:22:07.000000000 +0000
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++
++Name: gnome-vfs
++Description: The GNOME virtual file-system libraries
++Version: @VERSION@
++Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/libgnomevfs/libgnomevfs-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}
+--- gnome-vfs-2.5.7/gnome-vfs-module-2.0-uninstalled.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-vfs-2.5.7.new/gnome-vfs-module-2.0-uninstalled.pc.in	2004-02-25 15:26:16.000000000 +0000
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++
++Name: gnome-vfs-module
++Description: The GNOME virtual file-system module include info
++Version: @VERSION@
++Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/libgnomevfs/libgnomevfs-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}