--- a/ChangeLog	Wed Jul 11 08:34:46 2007 +0000
+++ b/ChangeLog	Wed Jul 11 11:15:39 2007 +0000
@@ -1,3 +1,22 @@
+2007-07-11  Damien Carbery <[email protected]>
+
+	* SUNWevolution.spec: Add a new schemas file to %files.
+	* SUNWgnome-img-viewer.spec: Add eog-image-collection.png and
+	  thumbnail-frame.png to %files.
+	* base-specs/evolution-exchange.spec: Add patch 01-pretty-function to
+	  fix build error 455858.
+	* patches/evolution-exchange-01-pretty-function.diff: Added to fix
+	  455858.
+	* base-specs/pygtk2.spec: Bump to 2.10.5. Remove obsolete patch,
+	  02-gtk-tooltips.
+	* patches/pygtk2-02-gtk-tooltips.diff: Removed, obsolete.
+	* base-specs/libwnck.spec: Remove upstream patch, 02-group-windows.
+	* patches/libwnck-02-group-windows.diff: Removed, upstream.
+	* base-specs/at-spi.spec, base-specs/libgail-gnome.spec,
+	  base-specs/gail.spec: Bump to 1.19.5.
+	* base-specs/eel.spec: Bump to 2.19.5.
+	* base-specs/libgnomecanvas.spec: Bump to 2.19.0.
+
 2007-07-11  Evan Yan  <[email protected]>
 
 	* base-specs/ospm.spec: Bump to 0.2

--- a/SUNWevolution.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/SUNWevolution.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -1,4 +1,4 @@
-#
+
 # spec file for package SUNWevolution
 #
 # includes module(s): evolution
@@ -277,12 +277,15 @@
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder-%{evolution.major_version}.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Add a new schemas file to %files.
 * Wed Jun 06 2007 - [email protected]
 - Add new schema file and remove Evolution version number from muliple files.
 * Tue May 15 2007 - [email protected]

--- a/SUNWgnome-img-viewer.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/SUNWgnome-img-viewer.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -216,25 +216,32 @@
 %{_datadir}/icons/hicolor/16x16/apps/eog.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/actions
 %{_datadir}/icons/hicolor/16x16/actions/eog-plugin.png
+%{_datadir}/icons/hicolor/16x16/actions/eog-image-collection.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps
 %{_datadir}/icons/hicolor/22x22/apps/eog.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/actions
 %{_datadir}/icons/hicolor/22x22/actions/eog-plugin.png
+%{_datadir}/icons/hicolor/22x22/actions/eog-image-collection.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24/apps
 %{_datadir}/icons/hicolor/24x24/apps/eog.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24/actions
+%{_datadir}/icons/hicolor/24x24/actions/eog-image-collection.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
 %{_datadir}/icons/hicolor/32x32/apps/eog.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/actions
 %{_datadir}/icons/hicolor/32x32/actions/eog-plugin.png
+%{_datadir}/icons/hicolor/32x32/actions/eog-image-collection.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/actions
 %{_datadir}/icons/hicolor/48x48/actions/eog-plugin.png
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable/apps
 %{_datadir}/icons/hicolor/scalable/apps/eog.svg
+%dir %attr (-, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/eog/thumbnail-frame.png
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
@@ -264,6 +271,8 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Add eog-image-collection.png and thumbnail-frame.png to %files.
 * Wed May 16 2007 - [email protected]
 - Add devel package; add icons to base package.
 * Thu May 10 2007 - [email protected]

--- a/base-specs/at-spi.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/at-spi.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -10,7 +10,7 @@
 Name:         at-spi
 License:      LGPL
 Group:        System/Libraries
-Version:      1.19.3
+Version:      1.19.5
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -121,6 +121,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Bump to 1.19.5.
 * Wed Jun 06 2007 - [email protected]
 - Bump to 1.19.3.
 * Thu May 10 2007 - [email protected]

--- a/base-specs/eel.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/eel.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -9,7 +9,7 @@
 Name:         eel
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.19.4
+Version:      2.19.5
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -106,6 +106,8 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Bump to 2.19.5.
 * Tue Jun 19 2007 - [email protected]
 - Bump to 2.19.4.
 * Wed Jun 06 2007 - [email protected]

--- a/base-specs/evolution-exchange.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/evolution-exchange.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -16,6 +16,8 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      Evolution connector for Microsoft Exchange
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.11/%{name}-%{version}.tar.bz2
+# date:2006-07-11 owner:dcarbery type:bug bugzilla:455858
+Patch1:       evolution-exchange-01-pretty-function.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/ximian-connector
@@ -106,6 +108,8 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Add patch 01-pretty-function to fix build error 455858.
 * Tue Jul 10 2007 - [email protected]
 - Bump to 2.11.5.
 * Tue Jun 19 2007 - [email protected]

--- a/base-specs/gail.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/gail.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -10,7 +10,7 @@
 Name:         gail
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      1.19.3
+Version:      1.19.5
 Release:      202
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -103,6 +103,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Bump to 1.19.5.
 * Wed Jun 06 2007 - [email protected]
 - Bump to 1.19.3.
 * Thu May 10 2007 - [email protected]

--- a/base-specs/libgail-gnome.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/libgail-gnome.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -10,12 +10,12 @@
 Name:         libgail-gnome
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      1.18.0
+Version:      1.19.5
 Release:      42
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Accessibility implementation for GTK+ and GNOME libraries
-Source:       http://ftp.gnome.org/pub/GNOME/sources/libgail-gnome/1.18/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/libgail-gnome/1.19/%{name}-%{version}.tar.bz2
 URL:          http://developer.gnome.org/projects/gap
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -85,6 +85,8 @@
 %{_libdir}/pkgconfig
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Bump to 1.19.5.
 * Mon Mar 12 2007 - [email protected]
 - Bump to 1.18.0.
 * Tue Jan 31 2006 - [email protected]

--- a/base-specs/libgnomecanvas.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/libgnomecanvas.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -10,12 +10,12 @@
 Name:         libgnomecanvas
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.14.0
+Version:      2.19.0
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Canvas Library for GNOME
-Source:       http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.14/libgnomecanvas-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.19/libgnomecanvas-%{version}.tar.bz2
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -122,6 +122,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Bump to 2.19.0.
 * Fri Nov  3 2006 - [email protected]
 - use %gtk_doc_option in configure so that it can be disabled using
   --without-gtk-doc

--- a/base-specs/libwnck.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/libwnck.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -19,8 +19,6 @@
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 #owner:niall date:2006-10-11 type:feature
 Patch1:       libwnck-01-trusted-extensions.diff
-#owner:padraig date:2007-02-05 type:bug bugster:6189796 bugzilla:339861
-Patch2:       libwnck-02-group-windows.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -61,7 +59,6 @@
 %if %build_tjds
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 %ifos linux
@@ -112,6 +109,8 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 11 2007 - [email protected]
+- Remove upstream patch, 02-group-windows.
 * Tue Jul 10 2007 - [email protected]
 - Remove upstream patch, 03-x11-keysym.
 * Mon Jul 09 2007 - [email protected]

--- a/base-specs/pygtk2.spec	Wed Jul 11 08:34:46 2007 +0000
+++ b/base-specs/pygtk2.spec	Wed Jul 11 11:15:39 2007 +0000
@@ -10,7 +10,7 @@
 Name:			pygtk2
 License:		LGPL	
 Group:			System/Library
-Version:		2.10.4
+Version:		2.10.6
 Release:		2
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -18,8 +18,6 @@
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/pygtk-%{version}.tar.bz2
 # date:2005-10-27 owner:dcarbery type:feature bugzilla:385131
 Patch1:                 pygtk2-01-uninstalled.pc.diff
-# date:2007-06-22 owner:dcarbery type:bug bugzilla:449318
-Patch2:                 pygtk2-02-gtk-tooltips.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -61,7 +59,6 @@
 %prep
 %setup -q -n pygtk-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoconf
@@ -98,6 +95,8 @@
 %{_datadir}/pygtk/*
 
 %changelog -n pygtk2
+* Wed Jul 11 2007 - [email protected]
+- Bump to 2.10.5. Remove obsolete patch, 02-gtk-tooltips.
 * Fri Jun 22 2007 - [email protected]
 - Add patch 02-gtk-tooltips to fix bugzilla 449318 (pygtk not in sync with gtk+)
 * Tue Feb  6 2007 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-exchange-01-pretty-function.diff	Wed Jul 11 11:15:39 2007 +0000
@@ -0,0 +1,38 @@
+--- evolution-exchange-2.11.5/camel/camel-exchange-summary.c.orig	2007-07-11 09:15:01.889646110 +0100
++++ evolution-exchange-2.11.5/camel/camel-exchange-summary.c	2007-07-11 09:22:49.961489348 +0100
+@@ -161,7 +161,7 @@
+ 	exchange->version = version;
+ 	
+ 
+-	d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, high_article_num));
++	d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, high_article_num));
+ 
+ 	return 0;
+ }
+@@ -183,7 +183,7 @@
+ 	if (camel_file_util_encode_uint32 (out, exchange->high_article_num) == -1)
+ 		return -1;
+ 
+-	d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, exchange->high_article_num));
++	d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, exchange->high_article_num));
+ 
+ 	return 0;
+ }
+@@ -216,7 +216,7 @@
+ 		}
+ 		
+ 		einfo->href = href;
+-		d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, einfo->href));
++		d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, einfo->href));
+ 	}
+ 
+ 	return info;
+@@ -239,7 +239,7 @@
+ 	if (camel_file_util_encode_string (out, einfo->href ? einfo->href : "") == -1)
+ 		return -1;
+ 
+-	d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, einfo->href));
++	d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, einfo->href));
+ 
+ 	return 0;
+ }

--- a/patches/libwnck-02-group-windows.diff	Wed Jul 11 08:34:46 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
---- /usr/tmp/clean/libwnck-2.19.5/libwnck/tasklist.c	2006-11-19 18:10:50.000000000 +0000
-+++ libwnck-2.19.5/libwnck/tasklist.c	2007-02-05 16:21:46.982456000 +0000
-@@ -223,6 +223,9 @@
-   int *size_hints;
-   int size_hints_len;
- 
-+  gint last_width;
-+  gint last_height;
-+
-   WnckLoadIconFunction icon_loader;
-   void *icon_loader_data;
-   GDestroyNotify free_icon_loader_data;
-@@ -699,6 +702,9 @@
-   for (i = 0; i < N_SCREEN_CONNECTIONS; i++)
-     tasklist->priv->screen_connections[i] = 0;
- 
-+  tasklist->priv->last_width = -1;
-+  tasklist->priv->last_height = -1;
-+
-   tasklist->priv->idle_callback_tag = 0;
- 
-   tasklist->priv->size_hints = NULL;
-@@ -1322,8 +1328,15 @@
-   tasklist->priv->max_button_width = wnck_tasklist_get_button_size (widget);
-   tasklist->priv->max_button_height = max_height;
- 
--  fake_allocation.width = GTK_WIDGET (tasklist)->allocation.width;
--  fake_allocation.height = GTK_WIDGET (tasklist)->allocation.height;
-+  if (tasklist->priv->last_width != -1)
-+  	fake_allocation.width = tasklist->priv->last_width;
-+  else
-+  	fake_allocation.width = GTK_WIDGET (tasklist)->allocation.width;
-+
-+  if (tasklist->priv->last_height != -1)
-+	fake_allocation.height = tasklist->priv->last_height;
-+  else
-+  	fake_allocation.height = GTK_WIDGET (tasklist)->allocation.height;
- 
-   array = g_array_new (FALSE, FALSE, sizeof (int));
- 
-@@ -1374,6 +1387,9 @@
-   
-   tasklist = WNCK_TASKLIST (widget);
- 
-+  tasklist->priv->last_width = allocation->width;
-+  tasklist->priv->last_height = allocation->height;
-+
-   n_windows = g_list_length (tasklist->priv->windows);
-   n_startup_sequences = g_list_length (tasklist->priv->startup_sequences);
-   n_grouped_buttons = 0;

--- a/patches/pygtk2-02-gtk-tooltips.diff	Wed Jul 11 08:34:46 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- pygtk-2.10.4/gtk/gtk.override.orig	2007-06-22 10:58:24.076341921 +0100
-+++ pygtk-2.10.4/gtk/gtk.override	2007-06-22 10:58:53.262188943 +0100
-@@ -3123,11 +3123,11 @@
-                          data->tip_private);
- }
- %%
--override-attr GtkTooltips.tips_data_list
-+override-attr GtkTooltips._tips_data_list
- static PyObject *
- _wrap_gtk_tooltips__get_tips_data_list(PyGObject *self, void *closure)
- {
--    GList *list = GTK_TOOLTIPS(self->obj)->tips_data_list;
-+    GList *list = GTK_TOOLTIPS(self->obj)->_tips_data_list;
-     gint         i, length;
-     PyObject    *pylist;
-     GList *iter;