--- a/ChangeLog	Fri Apr 23 14:38:40 2010 +0000
+++ b/ChangeLog	Fri Apr 23 14:52:41 2010 +0000
@@ -1,3 +1,9 @@
+2010-04-23  Ghee Teo  <[email protected]>
+
+	Complete fix of doo#15000 for fsexam
+	* patches/fsexam-01-remove-eel.diff:
+	* specs/SUNWfsexam.spec:
+
 2010-04-23  Christian Kelly  <[email protected]>
 
 	* base-specs/ekiga.spec: Set CONFIG_SHELL until I get the build systems

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fsexam-01-remove-eel.diff	Fri Apr 23 14:52:41 2010 +0000
@@ -0,0 +1,78 @@
+diff -urB fsexam-0.8.1.orig/configure.in fsexam-0.8.1.hacked/configure.in
+--- fsexam-0.8.1.orig/configure.in	2010-04-23 14:41:32.385944606 +0100
++++ fsexam-0.8.1.hacked/configure.in	2010-04-23 14:54:34.931729119 +0100
+@@ -65,8 +65,7 @@
+         [gnome-desktop-2.0 >= 2.0 \
+         libgnomeui-2.0 >= 2.0     \
+         libglade-2.0 >= 2.0       \
+-        gnome-vfs-module-2.0 >= 2.0 \
+-        eel-2.0 >= 2.2.3])
++        gnome-vfs-module-2.0 >= 2.0]) 
+ 
+ PKG_CHECK_MODULES(DUMMY, 
+         [glib-2.0 >= 2.8], 
+diff -urB fsexam-0.8.1.orig/src/fsexam-dnd.c fsexam-0.8.1.hacked/src/fsexam-dnd.c
+--- fsexam-0.8.1.orig/src/fsexam-dnd.c	2009-02-10 07:31:50.000000000 +0000
++++ fsexam-0.8.1.hacked/src/fsexam-dnd.c	2010-04-23 14:53:51.385616947 +0100
+@@ -34,8 +34,6 @@
+ #include <libgnome/libgnome.h>
+ #include <libgnomeui/libgnomeui.h>
+ #include <libgnomevfs/gnome-vfs.h>
+-#include <eel/eel-vfs-extensions.h>
+-#include <eel/eel-string.h>
+ #include <stdio.h>
+ 
+ #include "fsexam-header.h"
+@@ -54,6 +52,41 @@
+             {"x-special/gnome-icon-list", 0, FSEXAM_ICON_DND_GNOME_ICON_LIST}
+ };
+ 
++static gboolean
++_uri_has_prefix (const char *haystack, const char *needle)
++{
++        const char *h, *n;
++        char hc, nc;
++
++        h = haystack == NULL ? "" : haystack;
++        n = needle == NULL ? "" : needle;
++        do {
++                if (*n == '\0') {
++                        return TRUE;
++                }
++                if (*h == '\0') {
++                        return FALSE;
++                }
++                hc = *h++;
++                nc = *n++;
++                hc = g_ascii_tolower (hc);
++                nc = g_ascii_tolower (nc);
++        } while (hc == nc);
++        return FALSE;
++}
++
++static gboolean 
++_uri_is_desktop (gchar *uri)
++{
++  return _uri_has_prefix (uri, "x-nautilus-desktop:");
++}
++
++static gboolean 
++_uri_is_trash (gchar *uri)
++{
++  return _uri_has_prefix (uri, "trash:");
++}
++
+ static void
+ drag_data_received_callback (GtkWidget *widget,
+                              GdkDragContext *context,
+@@ -93,8 +126,8 @@
+     if (local_path) {
+         fsexam_change_dir (local_path);
+     } else {
+-        if (eel_uri_is_desktop (canonical_uri) 
+-                || eel_uri_is_trash (canonical_uri)) {
++        if (_uri_is_desktop (canonical_uri) 
++                || _uri_is_trash (canonical_uri)) {
+             gchar *uri = NULL;
+             p = strstr(canonical_uri, ":");
+             if (p != NULL) {

--- a/specs/SUNWfsexam.spec	Fri Apr 23 14:38:40 2010 +0000
+++ b/specs/SUNWfsexam.spec	Fri Apr 23 14:52:41 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): fsexam
 #
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. 
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -28,6 +28,8 @@
 Source1:	fsexam-l10n-po-1.11.tar.bz2
 Source2:	l10n-configure.sh
 Source3:        %{name}-manpages-0.1.tar.gz
+#owner:gheet date:2010-04-23 type:bug doo:15000
+Patch1:         fsexam-01-remove-eel.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 SUNW_Category:	G11NTOOLS,application,%{jds_version}
 SUNW_Copyright:	%{name}.copyright
@@ -74,6 +76,7 @@
 %setup -q -n %{cmpt}-%{version}
 bzcat %SOURCE1 | tar xf -
 gzcat %SOURCE3 | tar xf -
+%patch1 -p1
 
 bash -x %SOURCE2 --enable-sun-linguas
 
@@ -168,6 +171,8 @@
 %{_sysconfdir}/gconf/schemas/fsexam.schemas
 
 %changelog
+* Fri Apr 23 2010 - [email protected]
+- Added patch to remove reference to libeel.so.2
 * Wed Jun 17 2009 - [email protected]
 - replace the postrun script with a restart_fmri
 * Fri Sep 19 2008 - [email protected]