--- a/ChangeLog	Mon Dec 11 17:19:14 2006 +0000
+++ b/ChangeLog	Mon Dec 11 18:34:07 2006 +0000
@@ -1,3 +1,12 @@
+2006-12-11  Damien Carbery <[email protected]>
+
+	* metacity.spec: Bump to 2.17.3.
+	* enchant.spec: Remove unnecessary automake call; add autoconf and 
+	  adjust aclocal calls. Update patch metadata as the C++ libs portion
+	  is no longer an issue.
+	* patches/enchant-01-define_FILE.diff: Remove Makefile.am portions as
+	  setting LD=$CXX in SUNWgnome-spell.spec resolved the issue.
+
 2006-12-11  Matt Keenan <[email protected]>
 
 	* gnome-panel.spec : Amend patch comments/metainfo

--- a/enchant.spec	Mon Dec 11 17:19:14 2006 +0000
+++ b/enchant.spec	Mon Dec 11 18:34:07 2006 +0000
@@ -6,7 +6,6 @@
 # package are under the same license as the package itself.
 #
 # Owner: dcarbery
-# bugdb: bugzilla.abisource.com
 #
 
 Name:     	enchant
@@ -20,6 +19,7 @@
 Autoreqprov:    on
 URL:		http://www.abisource.com/projects/enchant/
 Source:		http://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
+# date:2006-12-08 bugzilla:10667 owner:dcarbery type:bug
 Patch1:         enchant-01-define_FILE.diff
 Summary:	Generic spell checking library
 Group:		Applications/Text
@@ -33,7 +33,6 @@
 
 %prep
 %setup  -q -n %{name}-%{version}
-# date:2006-12-08 bugzilla:10667,10668 owner:dcarbery type:bug
 %patch1 -p1
 
 
@@ -49,8 +48,8 @@
   CPUS=1
 fi
 
-aclocal $ACLOCAL_FLAGS
-automake -a -f -c
+aclocal -I ac-helpers $ACLOCAL_FLAGS
+autoconf
 ./configure \
     --prefix=%{_prefix} \
     --sysconfdir=%{_sysconfdir} \
@@ -70,5 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Dec 08 2006 - [email protected]
+* Mon Dec 11 2006 - [email protected]
+- Remove unnecessary automake call; add autoconf and adjust aclocal calls.
+
+* Fri Dec 08 2006 - [email protected]
 - Initial spec.

--- a/metacity.spec	Mon Dec 11 17:19:14 2006 +0000
+++ b/metacity.spec	Mon Dec 11 18:34:07 2006 +0000
@@ -10,7 +10,7 @@
 Name:         metacity
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.17.2
+Version:      2.17.3
 Release:      4
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -146,6 +146,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec 11 2006 - [email protected]
+- Bump to 2.17.3.
+
 * Thu Nov 23 2006 - [email protected]
 - Bump to 2.17.2. Remove upstream patch, 13-terminal-strict-focus. Comment out 
   patch 9 as it needs rework.

--- a/patches/enchant-01-define_FILE.diff	Mon Dec 11 17:19:14 2006 +0000
+++ b/patches/enchant-01-define_FILE.diff	Mon Dec 11 18:34:07 2006 +0000
@@ -17,25 +17,3 @@
  #include <cstdio>
  #include "htypes.hxx"
  
---- enchant-1.3.0/src/ispell/Makefile.am.orig	2006-12-08 16:48:58.216125000 +0000
-+++ enchant-1.3.0/src/ispell/Makefile.am	2006-12-08 16:49:32.611193000 +0000
-@@ -11,7 +11,7 @@
- 
- libenchant_ispell_lalibdir=$(libdir)/enchant
- libenchant_ispell_la_LIBADD= $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
--libenchant_ispell_la_LDFLAGS = -module -avoid-version -no-undefined
-+libenchant_ispell_la_LDFLAGS = -module -avoid-version -no-undefined -L/usr/lib -lc -lCstd -lCrun
- libenchant_ispell_la_SOURCES =	\
- 	correct.cpp		\
- 	good.cpp		\
---- enchant-1.3.0/src/myspell/Makefile.am.orig	2006-12-08 17:19:09.678682000 +0000
-+++ enchant-1.3.0/src/myspell/Makefile.am	2006-12-08 17:19:24.137897000 +0000
-@@ -11,7 +11,7 @@
- 
- libenchant_myspell_lalibdir=$(libdir)/enchant
- libenchant_myspell_la_LIBADD= $(MYSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
--libenchant_myspell_la_LDFLAGS = -module -avoid-version -no-undefined
-+libenchant_myspell_la_LDFLAGS = -module -avoid-version -no-undefined -lc -lCstd -lCrun
- 
- libenchant_myspell_la_SOURCES =	\
- 	affentry.hxx		\