--- a/ChangeLog	Tue Jun 17 11:08:55 2008 +0000
+++ b/ChangeLog	Tue Jun 17 11:42:29 2008 +0000
@@ -1,3 +1,10 @@
+2008-06-17  Damien Carbery <[email protected]>
+
+	* SUNWgnome-character-map.spec: Update %files as the %{_datadir}/icons
+	  dir is no longer delivered - a stock icon is used.
+	* base-specs/gucharmap.spec: Call aclocal/automake to get patched
+	  intltool.m4.
+
 2008-06-17  Damien Carbery <[email protected]>
 
 	* SUNWgnome-libs.spec: Update %files, removing

--- a/SUNWgnome-character-map.spec	Tue Jun 17 11:08:55 2008 +0000
+++ b/SUNWgnome-character-map.spec	Tue Jun 17 11:42:29 2008 +0000
@@ -64,6 +64,7 @@
 export CFLAGS="%optflags -I%{_includedir}"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 %gucharmap.build -d %name-%version
 
 %install
@@ -137,7 +138,6 @@
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/gucharmap/C
 %{_datadir}/omf/gucharmap/gucharmap-C.omf
-%attr (-, root, other) %{_datadir}/icons
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*char*map*
@@ -167,6 +167,9 @@
 %endif
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Update %files as the %{_datadir}/icons dir is no longer delivered - a stock
+  icon is used.
 * Thu Jun 12 2008 - [email protected]
 - Add missing root package dependency
 * Thu Jan  3 2008 - [email protected]

--- a/base-specs/gucharmap.spec	Tue Jun 17 11:08:55 2008 +0000
+++ b/base-specs/gucharmap.spec	Tue Jun 17 11:42:29 2008 +0000
@@ -64,7 +64,8 @@
   CPUS=1
 fi
 
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS -I m4
+automake --add-missing
 autoconf
 
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -113,7 +114,7 @@
 
 %changelog
 * Tue Jun 17 2008 - [email protected]
-- Bump to 2.23.4.
+- Bump to 2.23.4. Call aclocal/automake to get patched intltool.m4.
 
 * Tue Mar 11 2008 - [email protected]
 - Call aclocal to get patched intltool.m4.