--- a/ChangeLog	Tue Oct 30 16:07:52 2007 +0000
+++ b/ChangeLog	Wed Oct 31 17:18:44 2007 +0000
@@ -1,3 +1,11 @@
+2007-10-31  Damien Carbery <[email protected]>
+
+	* base-specs/eog.spec: Bump to 2.20.2.
+	* SUNWevolution.spec: Put the /usr/gnu references inside '%if
+	  %option_with_gnu_iconv' test.
+	* SUNWavahi-bridge-dsd.spec: Remove references to /usr/lib/mdns from
+	  LDFLAGS as the dir doesn't exist.
+
 2007-10-30  Damien Carbery <[email protected]>
 
 	* base-specs/orca.spec: Bump to 2.20.1.

--- a/SUNWavahi-bridge-dsd.spec	Tue Oct 30 16:07:52 2007 +0000
+++ b/SUNWavahi-bridge-dsd.spec	Wed Oct 31 17:18:44 2007 +0000
@@ -51,7 +51,7 @@
 export PKG_CONFIG_PATH=../avahi-%{avahi.version}:%{_pkg_config_path}
 export CFLAGS="%optflags -I/usr/sfw/include"
 export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="%_ldflags -L/usr/lib/mdns -R/usr/lib/mdns -ldns_sd -lsocket -lnsl -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
+export LDFLAGS="%_ldflags -ldns_sd -lsocket -lnsl -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
 
 %avahi.build -d %name-%version
 
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Wed Oct 31 2007 - [email protected]
+- Remove references to /usr/lib/mdns from LDFLAGS as the dir doesn't exist.
+
 * Fri Sep 07 2007 - [email protected]
 - Add Build/Requires SUNWgnome-base-libs/-devel for glib.
 - Add Build/Requires SUNWgnome-python-libs/-devel for gtk Python module.

--- a/SUNWevolution.spec	Tue Oct 30 16:07:52 2007 +0000
+++ b/SUNWevolution.spec	Wed Oct 31 17:18:44 2007 +0000
@@ -115,7 +115,10 @@
 #       should be re-enabled once these issues are fixed
 export LD=/usr/ccs/bin/ld 
 export LDFLAGS="%{?arch_ldadd} -Wl,-z,ignore -L%{_libdir} -R%{_libdir}"
-export CFLAGS="%optflags -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib"
+export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib"
+%endif
 export RPM_OPT_FLAGS="$CFLAGS"
 export PERL=/usr/perl5/bin/perl
 export PKG_CONFIG_PATH=%{_pkg_config_path}:%{_builddir}/%name-%version/evolution-%{evolution.version}
@@ -288,6 +291,8 @@
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 %changelog
+* Wed Oct 31 2006 - [email protected]
+- Put the /usr/gnu references inside '%if %option_with_gnu_iconv' test.
 * Mon Oct 22 2006 - [email protected]
 - Add %{_libexecdir}/evolution/%{evolution.major_version}/evolution-backup to
   %files for evolution 2.12.1 tarball.

--- a/base-specs/eog.spec	Tue Oct 30 16:07:52 2007 +0000
+++ b/base-specs/eog.spec	Wed Oct 31 17:18:44 2007 +0000
@@ -11,7 +11,7 @@
 Name:         eog
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.20.1
+Version:      2.20.2
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -123,6 +123,8 @@
 %{_prefix}/var/scrollkeeper
 
 %changelog
+* Wed Oct 31 2007 - [email protected]
+- Bump to 2.20.2.
 * Fri Oct 19 2007 - [email protected]
 - Bump to 2.20.1.
 * Tue Sep 18 2007 - [email protected]