--- a/ChangeLog	Thu Aug 16 10:11:29 2007 +0000
+++ b/ChangeLog	Thu Aug 16 13:38:34 2007 +0000
@@ -1,14 +1,23 @@
+2007-08-16  Damien Carbery <[email protected]>
+
+	* SUNWgnome-calculator.spec: Remove %files line because dir not
+	  installed.
+	* base-specs/gnome-menus.spec: Add patch 05-iconv-solaris to fix
+	  #467309.
+	* patches/gnome-menus-05-iconv-solaris.diff: Modify intltool-merge.in
+	  to allow use of non-GNU iconv. Fixes 467390.
+
 2007-08-16  Wang Xin <[email protected]>
 
-	* patches/evolution-data-server-03-timezone.diff: Update the patch because
-	of version bump.
+	* patches/evolution-data-server-03-timezone.diff: Update the patch
+	  because of version bump.
 
 2007-08-16  Takao Fujiwara  <[email protected]>
 
 	* base-specs/gnome-media.spec: Updated.
 	* base-specs/virt-manager.spec: Updated.
-	* patches/gnome-media-05-i18n-ui.diff: Added to localize g-v-c and rhythmbox
-	  Fixes 5095357 and 6553722
+	* patches/gnome-media-05-i18n-ui.diff: Added to localize g-v-c and
+	  rhythmbox. Fixes 5095357 and 6553722
 	* patches/virt-manager-03-g11n-desktop.diff: Added to localize .desktop.
 	  Fixes 6526323
 

--- a/SUNWgnome-calculator.spec	Thu Aug 16 10:11:29 2007 +0000
+++ b/SUNWgnome-calculator.spec	Thu Aug 16 13:38:34 2007 +0000
@@ -131,7 +131,7 @@
 %{_bindir}/*
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/*
+#%{_datadir}/applications/*
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/*/C
 %{_datadir}/omf/*/*-C.omf
@@ -156,6 +156,8 @@
 %{_sysconfdir}/gconf/schemas/gcalctool.schemas
 
 %changelog
+* Thu Aug 16 2007 - [email protected]
+- Remove %files line because dir not installed.
 * Tue Apr 24 2007 - [email protected]
 - s/0755/-/ in defattr so that files are not made all executable
 * Fri Sep 01 2006 - [email protected]

--- a/base-specs/gnome-menus.spec	Thu Aug 16 10:11:29 2007 +0000
+++ b/base-specs/gnome-menus.spec	Thu Aug 16 13:38:34 2007 +0000
@@ -24,6 +24,8 @@
 Patch3:                 gnome-menus-03-preferences.diff
 # date:2006-08-16 bugster:6460249 owner:harrylu type:feature
 Patch4:                 gnome-menus-04-support-alacarte.diff
+# date:2007-08-16 bugzilla:467390 owner:dcarbery type:bug
+Patch5:                 gnome-menus-05-iconv-solaris.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -67,6 +69,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %ifos linux
@@ -138,6 +141,10 @@
 %{_includedir}/gnome-menus/*
 
 %changelog
+* Thu Aug 16 2007 - [email protected]
+- Add patch 05-iconv-solaris to fix #467309.Modify intltool-merge.in to allow
+  use of non-GNU iconv.
+
 * Wed Aug 15 2007 - [email protected]
 - Bump to 2.19.90.
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-menus-05-iconv-solaris.diff	Thu Aug 16 13:38:34 2007 +0000
@@ -0,0 +1,22 @@
+--- gnome-menus-2.19.90/intltool-merge.in.orig	Thu Aug 16 14:00:31 2007
++++ gnome-menus-2.19.90/intltool-merge.in	Thu Aug 16 14:06:42 2007
+@@ -100,7 +100,8 @@
+ {
+     my ($file) = @_;
+     # If either a file exists, or when run it returns 0 exit status
+-    return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++    # Solaris iconv does not support --version but -l (list) is okay.
++    return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
+     return 0;
+ }
+ 
+@@ -112,7 +113,8 @@
+         my $version = `$file --version`;
+         return 1 if ($version =~ m/.*\(GNU .*\).*/);
+     }
+-    return 0;
++    # Return success when not using GNU iconv, as Solaris iconv seems okay.
++    return 1;
+ }
+ 
+ if (! isGNUGettextTool ("$iconv"))