--- a/ChangeLog	Wed Jun 28 08:42:42 2006 +0000
+++ b/ChangeLog	Wed Jun 28 09:44:38 2006 +0000
@@ -1,3 +1,10 @@
+2006-06-28  Halton Huo  <[email protected]>
+
+	* gnome-pilot.spec, patches/gnome-pilot-04-remove-nouse-libs.diff,
+	  patches/gnome-pilot-05-disable-gob-check.diff:
+	  Add patch gnome-pilot-04-remove-nouse-libs.diff to fix #6434263,
+	  add patch gnome-pilot-05-disable-gob-check.diff to remove gob build dependency.
+
 2006-06-27  Brian Cameron  <[email protected]>
 
 	* gst-plugins-good.spec, patches/gst-plugins-good-06-fixplay.diff:

--- a/Solaris/ChangeLog	Wed Jun 28 08:42:42 2006 +0000
+++ b/Solaris/ChangeLog	Wed Jun 28 09:44:38 2006 +0000
@@ -1,3 +1,7 @@
+2006-06-28  Halton Huo  <[email protected]>
+
+	* SUNWgnome-pilot.spec:Remove Build/Requires SUNWgob.
+
 2006-06-28  Damien Carbery <[email protected]>
 
 	* SUNWgnome-libs.spec: Add Build/Requires SUNWgnome-print/-devel for 

--- a/Solaris/SUNWgnome-pilot.spec	Wed Jun 28 08:42:42 2006 +0000
+++ b/Solaris/SUNWgnome-pilot.spec	Wed Jun 28 09:44:38 2006 +0000
@@ -48,7 +48,6 @@
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWpltlk
 BuildRequires: SUNWsfwhea
-BuildRequires: SUNWgob
 BuildConflicts:	SUNWgnome-pilot-link
 BuildConflicts:	SUNWgnome-pilot-link-root
 BuildConflicts:	SUNWgnome-pilot-link-share
@@ -201,6 +200,8 @@
 %{_sysconfdir}/gconf/schemas/pilot.schemas
 
 %changelog
+* Wed Jun 28 2006 - [email protected]
+- Remove Build/Requires SUNWgob.
 * Sun Jun 11 2006 - laca.com
 - change group from other to bin/sys
 * Thu Jan 08 2006 - [email protected]

--- a/gnome-pilot.spec	Wed Jun 28 08:42:42 2006 +0000
+++ b/gnome-pilot.spec	Wed Jun 28 09:44:38 2006 +0000
@@ -19,6 +19,8 @@
 Patch1:         gnome-pilot-01-all-in-one.diff
 Patch2:         gnome-pilot-02-pilot-link-version.diff
 Patch3:         gnome-pilot-03-capplet-install.diff
+Patch4:         gnome-pilot-04-remove-nouse-libs.diff
+Patch5:         gnome-pilot-05-disable-gob-check.diff
 URL:		http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Docdir:         %{_defaultdocdir}/gnome-pilot
@@ -55,6 +57,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %ifos linux
@@ -140,6 +144,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 28 2006 - [email protected].
+- Add patch gnome-pilot-04-remove-nouse-libs.diff to fix #6434263.
+- Add patch gnome-pilot-05-disable-gob-check.diff to remove gob build dependency.
+
 * Tue Jun 06 2006 - [email protected]
 - Remove patch gnome-pilot-01-configure-in.diff and reorder,
   build require gob2.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-04-remove-nouse-libs.diff	Wed Jun 28 09:44:38 2006 +0000
@@ -0,0 +1,12 @@
+--- gnome-pilot-2.0.13/capplet/Makefile.am.old	2006-06-27 15:53:03.873952000 +0800
++++ gnome-pilot-2.0.13/capplet/Makefile.am	2006-06-27 15:53:26.778679000 +0800
+@@ -31,9 +31,6 @@
+ 	-export-dynamic
+ 
+ gpilotd_control_applet_LDADD = \
+-	$(top_builddir)/gpilotd/gnome-pilot-structures.o 	\
+-	$(top_builddir)/gpilotd/gpilot-gui.o 			\
+-	$(top_builddir)/gpilotd/gnome-pilot-conduit.o 		\
+ 	$(top_builddir)/gpilotd/libgpilotd.la 			\
+ 	$(top_builddir)/gpilotd/libgpilotdconduit.la    	\
+ 	$(top_builddir)/libgpilotdCM/libgpilotdcm.la    	\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-05-disable-gob-check.diff	Wed Jun 28 09:44:38 2006 +0000
@@ -0,0 +1,12 @@
+diff -urN gnome-pilot-2.0.13/configure.in gnome-pilot-2.0.13-hacked/configure.in
+--- gnome-pilot-2.0.13/configure.in	2005-04-05 09:28:57.000000000 +1200
++++ gnome-pilot-2.0.13-hacked/configure.in	2006-01-17 20:44:23.257018000 +1300
+@@ -146,8 +146,6 @@
+ 	else
+ 		AC_MSG_ERROR([GOB2 not found and the gob outputfiles are not present, check http://www.5z.com/jirka/gob.html and read the HACKING file])
+ 	fi
+-else
+-	GOB2_CHECK(2.0.3)
+ fi
+ 
+ dnl ***********