--- a/ChangeLog	Mon Feb 16 00:38:22 2004 +0000
+++ b/ChangeLog	Mon Feb 16 10:38:31 2004 +0000
@@ -1,3 +1,22 @@
+2004-02-16  Niall Power <[email protected]>
+
+	* gnome-desktop.spec: add patch to make it linkable from
+	  an uninstalled state. Add $ACLOCAL_FLAGS and utilise the
+ 	  correct OS release file (/etc/release) on Solaris
+	* patches/gnome-desktop-08-uninstalled-pc.diff: new patch
+	* librsvg.spec: add patch to make it linkable from an 
+	  uninstalled state. Autotoolize the build stage
+	* patchse/librsvg-01-uninstalled-pc.diff: new patch
+	* eel.spec: add 3 patches: One to fix a forte compilation
+	  issue, 02 to make it linkable from an uninstalled state and
+	  03 to fix a Makefile.am parsing error. Also autotoolize the
+	  build stage.
+	* patches/eel-01-image-table-const.diff: new patch
+	* patches/eel-02-uninstalled-pc.diff: new patch
+	* patches/eel-03-makefile-am-deprecation.diff: new patch
+	* nautilus.spec: only apply patch 02 (printers) on linux since
+	  cups isn's included with solaris by default
+
 2004-02-15  Laszlo Peter  <[email protected]>
 
         * scrollkeeper.spec: add patch to make it build on Solaris, and

--- a/eel.spec	Mon Feb 16 00:38:22 2004 +0000
+++ b/eel.spec	Mon Feb 16 10:38:31 2004 +0000
@@ -2,12 +2,15 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.5.4
-Release:      3
+Release:      4
 Distribution: Quicksilver
 Vendor:       Sun Microsystems, Inc.
 Summary:      Eazel Extensions Library
 Source:       http://ftp.gnome.org/pub/GNOME/sources/eel/2.5/eel-%{version}.tar.bz2
 Source1:      eel-l10n-po-0.6.tar.bz2
+Patch1:       eel-01-image-table-const.diff
+Patch2:       eel-02-uninstalled-pc.diff
+Patch3:       eel-03-makefile-am-deprecation.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -46,10 +49,19 @@
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 bzcat %SOURCE1 | tar xvf -
 
 %build
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
+autoheader
+automake -a -c -f
+autoconf
+
 CFLAGS="$RPM_OPT_FLAGS"			\
 ./configure --prefix=%{_prefix}		\
 	    --sysconfdir=%{_sysconfdir}
@@ -83,7 +95,12 @@
 %{_includedir}/eel-2
 
 %changelog
-* Wed Jan 07 2005 - <[email protected]>
+* Thu Feb 12 2004 - <[email protected]>
+- added patches 01, 02 and 03: compilation fixes, add a -uninstalled-pc file,
+  fix errors in Makefile.am
+- autotoolize the build stage
+
+* Wed Jan 07 2004 - <[email protected]>
 - Updated to 2.5.4
 
 * Tue Dec 16 2003 - <[email protected]>

--- a/gnome-desktop.spec	Mon Feb 16 00:38:22 2004 +0000
+++ b/gnome-desktop.spec	Mon Feb 16 10:38:31 2004 +0000
@@ -22,6 +22,7 @@
 Patch5:       gnome-desktop-05-about-dialog.diff
 Patch6:       gnome-desktop-06-branding-gnome-version.diff
 Patch7:       gnome-desktop-07-omf-make.diff
+Patch8:       gnome-desktop-08-uninstalled-pc.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -71,14 +72,19 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 libtoolize --force
-aclocal -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
 automake -a -c -f
 autoconf
 
+%ifos solaris
+release_version=`cat /etc/release`
+%else
 release_version=`cat /etc/sun-release`
+%endif
 
 CFLAGS="$RPM_OPT_FLAGS"		\
 ./configure --prefix=%{_prefix}		\

--- a/librsvg.spec	Mon Feb 16 00:38:22 2004 +0000
+++ b/librsvg.spec	Mon Feb 16 10:38:31 2004 +0000
@@ -2,11 +2,12 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.5.0
-Release:      3
+Release:      4
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      Library for SVG support for GNOME
 Source:       http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.5/librsvg-%{version}.tar.bz2
+Patch1:       librsvg-01-uninstalled-pc.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}/librsvg
@@ -50,8 +51,14 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
+autoheader
+automake -a -c -f
+autoconf
 CFLAGS="$RPM_OPT_FLAGS"			\
 ./configure --prefix=%{_prefix}		\
             --sysconfdir=%{_sysconfdir} \
@@ -89,6 +96,10 @@
 %{_includedir}/librsvg-2
 
 %changelog
+* Thu Feb 12 2004 - <[email protected]>
+- added a -uninstalled.pc file patch.
+- autotoolize the build stage
+
 * Tue Dec 16 2003 - <[email protected]>
 - Update to 2.5.0
 

--- a/nautilus.spec	Mon Feb 16 00:38:22 2004 +0000
+++ b/nautilus.spec	Mon Feb 16 10:38:31 2004 +0000
@@ -8,7 +8,7 @@
 License:      GPL
 Group:        Productivity/File utilities
 Version:      2.5.4
-Release:      5 
+Release:      6 
 Distribution: Quicksilver
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GNOME Filemanager
@@ -115,7 +115,9 @@
 %prep
 %setup -q
 %patch1 -p1
+%ifos linux
 %patch2 -p1
+%endif
 # %patch3 -p1
 #%patch4 -p1
 # %patch5 -p1
@@ -133,7 +135,7 @@
 
 %build
 libtoolize --force --copy
-aclocal -I %{_datadir}/aclocal/gnome2-macros -I .
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
 automake -a -c -f
 autoconf
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -232,6 +234,10 @@
 
 
 %changelog
+* Thu Feb 12 2004 - [email protected]
+- added ACLOCAL_FLAGS to aclocal invocation
+- only apply patch 02 (printers) on linux
+
 * Mon Feb 09 2004 - [email protected]
 - ported Network Places patch
 * Mon Jan 26 2004 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/eel-01-image-table-const.diff	Mon Feb 16 10:38:31 2004 +0000
@@ -0,0 +1,16 @@
+Index: eel/test/test-eel-image-table.c
+===================================================================
+RCS file: /cvs/GNOME-RE/eel/test/test-eel-image-table.c,v
+retrieving revision 1.10
+diff -u -r1.10 test-eel-image-table.c
+--- eel/test/test-eel-image-table.c	2003/02/05 18:30:32	1.10
++++ eel/test/test-eel-image-table.c	2003/08/19 14:58:35
+@@ -64,7 +64,7 @@
+ 	GdkPixbuf *pixbuf = NULL;
+ 	
+ 	if (icon_name) {
+-		const float sizes[] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,
++		float sizes[] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,
+ 					1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0 };
+ 		pixbuf = test_pixbuf_new_named (icon_name, sizes[random () % G_N_ELEMENTS (sizes)]);
+ 	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/eel-02-uninstalled-pc.diff	Mon Feb 16 10:38:31 2004 +0000
@@ -0,0 +1,24 @@
+--- eel-2.5.4/configure.in	2003-12-29 10:26:02.000000000 +0000
++++ eel-2.5.4.new/configure.in	2004-02-13 10:54:19.000000000 +0000
+@@ -233,6 +233,7 @@
+ AC_OUTPUT([
+ Makefile
+ eel-2.0.pc
++eel-2.0-uninstalled.pc
+ eel.spec
+ eel/Makefile
+ eel/eel-features.h
+--- eel-2.5.4/eel-2.0-uninstalled.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ eel-2.5.4.new/eel-2.0-uninstalled.pc.in	2004-02-13 11:08:39.000000000 +0000
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@/eel-2
++
++Name: eel
++Description: Eazel Extensions Library
++Version: @VERSION@
++Requires: gconf-2.0 gdk-pixbuf-2.0 glib-2.0 gmodule-2.0 gnome-vfs-2.0 gthread-2.0 gtk+-2.0 libart-2.0 libgnome-2.0 libgnomeui-2.0 libxml-2.0 gail libglade-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/eel/libeel-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/eel-03-makefile-am-deprecation.diff	Mon Feb 16 10:38:31 2004 +0000
@@ -0,0 +1,26 @@
+--- eel-2.5.4/eel/Makefile.am	2003-12-10 14:13:21.000000000 +0000
++++ eel-2.5.4.new/eel/Makefile.am	2004-02-13 14:06:14.000000000 +0000
+@@ -14,10 +14,6 @@
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+ 	$(NULL)
+ 
+-# Disable this for now due to gtk 2.4 deprecation
+-#	-DGTK_DISABLE_DEPRECATED			\
+-#	-DGNOME_DISABLE_DEPRECATED			\
+-
+ # FIXME: put this back once the registration_id stuff is cleared up
+ #	-DBONOBO_DISABLE_DEPRECATED
+ 
+--- eel-2.5.4/test/Makefile.am	2003-10-22 08:52:41.000000000 +0100
++++ eel-2.5.4.new/test/Makefile.am	2004-02-13 14:19:36.000000000 +0000
+@@ -10,10 +10,6 @@
+ 	-DGDK_DISABLE_DEPRECATED \
+ 	$(NULL)
+ 
+-# Disable this for now due to gtk 2.4 deprecation
+-#	-DGTK_DISABLE_DEPRECATED \
+-#	-DGNOME_DISABLE_DEPRECATED \
+-
+ LDADD = \
+ 	$(top_builddir)/eel/libeel-2.la \
+ 	$(EEL_LIBS) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-desktop-08-uninstalled-pc.diff	Mon Feb 16 10:38:31 2004 +0000
@@ -0,0 +1,24 @@
+--- gnome-desktop-2.5.4/configure.in	2004-02-04 08:06:27.000000000 +0000
++++ gnome-desktop-2.5.4.new/configure.in	2004-02-13 09:45:34.000000000 +0000
+@@ -155,6 +155,7 @@
+ gnome-about/headers/Makefile
+ libgnome-desktop/Makefile
+ libgnome-desktop/gnome-desktop-2.0.pc
++libgnome-desktop/gnome-desktop-2.0-uninstalled.pc
+ gnome-version.xml.in
+ po/Makefile.in
+ pixmaps/Makefile
+--- gnome-desktop-2.5.4/libgnome-desktop/gnome-desktop-2.0-uninstalled.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ gnome-desktop-2.5.4.new/libgnome-desktop/gnome-desktop-2.0-uninstalled.pc.in	2004-02-13 09:43:34.000000000 +0000
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: gnome-desktop-2.0
++Description: Utility library for loading .desktop files
++Requires: gtk+-2.0 libgnomeui-2.0 @STARTUP_NOTIFICATION_PACKAGE@
++Version: @VERSION@
++Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-desktop-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/librsvg-01-uninstalled-pc.diff	Mon Feb 16 10:38:31 2004 +0000
@@ -0,0 +1,24 @@
+--- librsvg-2.5.0/configure.in	2003-12-07 19:34:34.000000000 +0000
++++ librsvg-2.5.0.new/configure.in	2004-02-12 16:28:40.000000000 +0000
+@@ -302,6 +302,7 @@
+ librsvg-features.h
+ Makefile
+ librsvg-2.0.pc
++librsvg-2.0-uninstalled.pc
+ librsvg-zip
+ doc/Makefile
+ gtk-engine/Makefile
+--- librsvg-2.5.0/librsvg-2.0-uninstalled.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ librsvg-2.5.0.new/librsvg-2.0-uninstalled.pc.in	2003-03-18 21:08:48.000000000 +0000
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: librsvg
++Description: library that renders svg files using libart and pango
++Version: @VERSION@
++Requires: glib-2.0 gdk-pixbuf-2.0 libart-2.0 libxml-2.0 pangoft2 @LIBGSFPKG@ @LIBCROCOPKG@
++Libs: ${pc_top_builddir}/${pcfiledir}/librsvg-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}