--- a/ChangeLog	Tue Jul 31 14:22:33 2007 +0000
+++ b/ChangeLog	Tue Jul 31 15:51:53 2007 +0000
@@ -1,3 +1,27 @@
+2007-07-31  Damien Carbery <[email protected]>
+
+	* SUNWgnome-libs.spec: Add new file %{_libdir}/pam_gnome_keyring.so to
+	  %files. Remove %{_libexecdir}/gnome_segv2 as it is no longer
+	  installed.
+	* base-specs/libglade.spec: Bump to 2.6.2. Remove upstream patch,
+	  01-gtk-tooltips.
+	* patches/libglade-01-gtk-tooltips.diff: Removed, upstream.
+	* base-specs/evolution.spec: Bump to 2.11.6. Remove upstream patch,
+	  08-create-new-meeting.
+	* patches/evolution-08-create-new-meeting.diff: Removed, upstream.
+	* base-specs/gnome-screensaver.spec: Bump to 2.19.6.
+	* base-specs/nautilus-cd-burner.spec: Bump to 2.19.6.
+	* base-specs/evolution-data-server.spec: Bump to 1.11.6.
+	* base-specs/evolution-exchange.spec: Bump to 2.11.6.
+	* base-specs/yelp.spec: Bump to 2.19.1. Remove obsolete patches,
+	  01-null-frag-id and 02-empty-contents-list. Rename remainder.
+	* patches/yelp-01-null-frag-id.diff,
+	  patches/yelp-02-empty-contents-list.diff: Removed, obsolete.
+	* patches/yelp-01-macro-reference-crash.diff: Renamed from 03.
+	* base-specs/gnome-python.spec: Bump to 2.19.2.
+	* base-specs/gtkhtml.spec: Bump to 3.15.6.
+	* base-specs/gtk2-engines.spec: Bump to 2.11.4.
+
 2007-07-31  Damien Carbery <[email protected]>
 
 	* base-specs/gnome-menus.spec, base-specs/gnome-session.spec,

--- a/SUNWgnome-libs.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/SUNWgnome-libs.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -232,11 +232,11 @@
 %{_bindir}/bonobo-browser
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
+%{_libdir}/pam_gnome_keyring.so
 %{_libdir}/bonobo/monikers/*.so
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/gtk-2.0/2.*.*/filesystems/lib*.so*
 %{_libdir}/libglade/2.0/*.so
-%{_libexecdir}/gnome_segv2
 %{_libexecdir}/gnome-keyring-ask
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/gnome-2.0/*
@@ -301,6 +301,9 @@
 %endif
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Add new file %{_libdir}/pam_gnome_keyring.so to %files. Remove
+  %{_libexecdir}/gnome_segv2 as it is no longer installed.
 * Wed May 16 2007 - [email protected]
 - Add Build/Requires SUNWlibgcrypt/-devel for gnome-keyring. Adjust
   PKG_CONFIG_PATH because gnome-keyring .pc file in subdir now.

--- a/base-specs/evolution-data-server.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/evolution-data-server.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -9,7 +9,7 @@
 Name:         evolution-data-server
 License:      GPL
 Group:        System/Libraries/GNOME
-Version:      1.11.5
+Version:      1.11.6
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -169,6 +169,8 @@
 %{_datadir}/idl/*
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 1.11.6.
 * Tue Jul 10 2007 - [email protected]
 - Bump to 1.11.5.
 * Mon Jun 18 2007 - [email protected]

--- a/base-specs/evolution-exchange.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/evolution-exchange.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,7 +10,7 @@
 Name:         evolution-exchange
 License:      GPL
 Group:        System/Libraries/GNOME
-Version:      2.11.5
+Version:      2.11.6
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -109,6 +109,8 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.11.6.
 * Wed Jul 11 2007 - [email protected]
 - Add patch 01-pretty-function to fix build error 455858.
 * Tue Jul 10 2007 - [email protected]

--- a/base-specs/evolution.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/evolution.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -13,7 +13,7 @@
 Group:        System/GUI/GNOME
 # major_version is generally a 'stable' build number i.e. has an even number.
 %define major_version 2.12
-Version:      2.11.5
+Version:      2.11.6
 Release:      1
 Distribution: java-desktop-system
 Vendor:       Sun Microsystems, Inc.
@@ -37,8 +37,6 @@
 Patch6:       evolution-06-perl-path.diff
 # date:2007-06-26 bugzilla:237830 owner:jedy type:bug
 Patch7:       evolution-07-lost-tab.diff
-# date:2007-07-05 bugzilla:453860 bugster:6575462 owner:xz159989 type:bug
-Patch8:       evolution-08-create-new-meeting.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/evolution
@@ -122,7 +120,6 @@
 cp addressbook/tools/csv2vcard addressbook/tools/csv2vcard.in
 
 %patch7 -p0
-%patch8 -p0
 
 %build
 
@@ -235,6 +232,8 @@
 %{_datadir}/gnome-pilot/*
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.11.6. Remove upstream patch, 08-create-new-meeting.
 * Tue Jul 10 2007 - [email protected]
 - Bump to 2.11.5. Remove upstream patches, 07-empty-line and 09-save-all-parts.
 * Thu Jul 05 2007 - [email protected]

--- a/base-specs/gnome-python.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/gnome-python.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,7 +10,7 @@
 Name:			gnome-python
 License:		LGPL	
 Group:			System/Library
-Version:		2.19.1
+Version:		2.19.2
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -105,6 +105,9 @@
 %{_includedir}/*
 
 %changelog -n gnome-python
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.19.2.
+
 * Mon Jul 09 2007 - [email protected]
 - Bump to 2.19.1.
 

--- a/base-specs/gnome-screensaver.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/gnome-screensaver.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,7 +10,7 @@
 Name:         gnome-screensaver
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.19.1.1
+Version:      2.19.6
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -102,6 +102,9 @@
 %{_libdir}/*
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.19.6.
+
 * Wed May 09 2007 - [email protected]
 - Bump to 2.19.1.1. Add patch 01-X-libs to include libX11 and libXext during
   build. Fixes 437225 .

--- a/base-specs/gtk2-engines.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/gtk2-engines.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,7 +10,7 @@
 Name:         gtk2-engines
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.11.3
+Version:      2.11.4
 Release:      2
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -76,6 +76,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog -n gtk2-engines
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.11.4.
 * Tue Jul 10 2007 - [email protected]
 - Bump to 2.11.3.
 * Wed Jun 06 2007 - [email protected]

--- a/base-specs/gtkhtml.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/gtkhtml.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -12,7 +12,7 @@
 Group:        System/Libraries/GNOME
 # major_version is generally a 'stable' build number i.e. has an even number.
 %define major_version 3.14
-Version:      3.15.5
+Version:      3.15.6
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -107,6 +107,9 @@
 %{_includedir}/libgtkhtml-%{major_version}/*
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 3.15.6.
+
 * Tue Jul 10 2007 - [email protected]
 - Bump to 3.15.5.
 

--- a/base-specs/libglade.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/libglade.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,14 +10,12 @@
 Name:         libglade
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.6.1
+Version:      2.6.2
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Library for loading GLADE interfaces at runtime
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-#owner:dcarbery date:2007-07-24 bugzilla:455566 type:bug state:upstream
-Patch1:       libglade-01-gtk-tooltips.diff
 URL:          http://www.daa.com.au/~james/gnome/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -50,7 +48,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 
 %build
@@ -110,6 +107,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.6.2. Remove upstream patch, 01-gtk-tooltips.
 * Tue Jul 24 2007 - [email protected]
 - Add upstream patch, 01-gtk-tooltips, to fix build failure. Bugzilla: 455566.
 * Tue Jun 19 2007 - [email protected]

--- a/base-specs/nautilus-cd-burner.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/nautilus-cd-burner.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,7 +10,7 @@
 Name:         nautilus-cd-burner
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.19.1
+Version:      2.19.6
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -123,6 +123,8 @@
 %{_libdir}/pkgconfig/libnautilus-burn.pc
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.19.6.
 * Tue Jun 12 2007 - [email protected]
 - add patch -03-eject.diff.
 * Mon May 14 2007 - [email protected]

--- a/base-specs/yelp.spec	Tue Jul 31 14:22:33 2007 +0000
+++ b/base-specs/yelp.spec	Tue Jul 31 15:51:53 2007 +0000
@@ -10,18 +10,14 @@
 Name:         yelp
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.18.1
+Version:      2.19.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 Summary:      The GNOME Help Browser 
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
-# date:2006-09-18 type:bug owner:mattman bugster:6471853 bugzilla:318996
-Patch1:       yelp-01-null-frag-id.diff
-# date:2007-04-10 type:bug owner:mattman bugster:6534411 bugzilla:428273
-Patch2:       yelp-02-empty-contents-list.diff
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
 # date:2007-06-13 type:bug owner:mattman bugster:6560664 bugzilla:447107
-Patch3:       yelp-03-macro-reference-crash.diff
+Patch1:       yelp-01-macro-reference-crash.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -74,8 +70,6 @@
 %setup -q
 
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %ifos linux
@@ -131,6 +125,10 @@
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 
 %changelog
+* Tue Jul 31 2007 - [email protected]
+- Bump to 2.19.1. Remove obsolete patches, 01-null-frag-id and
+  02-empty-contents-list.
+
 * Wed Jun 13 2007 - [email protected]
 - Fix crash for #6560664 patch in bugzilla #447107
 

--- a/patches/evolution-08-create-new-meeting.diff	Tue Jul 31 14:22:33 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- calendar/gui/e-select-names-editable.c.org	2007-07-03 20:39:25.298862000 +0800
-+++ calendar/gui/e-select-names-editable.c	2007-07-03 20:51:23.450738000 +0800
-@@ -151,7 +151,8 @@
- 	} else {
- 		/* check if the contact is contact list, it does not contain all the email ids  */
- 		/* we dont expand it currently, TODO do we need to expand it by getting it from addressbook*/
--		if (e_contact_get (e_destination_get_contact (destination), E_CONTACT_IS_LIST)) {
-+		if (e_destination_get_contact (destination) && 
-+		    e_contact_get (e_destination_get_contact (destination), E_CONTACT_IS_LIST)) {
- 			/* If its a contact_list which is not expanded, it wont have a email id,
- 			   so we can use the name as the email id */
- 

--- a/patches/libglade-01-gtk-tooltips.diff	Tue Jul 31 14:22:33 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- libglade-2.6.2/glade/Makefile.am	2006/01/04 01:28:07	521
-+++ libglade-2.6.2/glade/Makefile.am	2007/07/11 20:55:11	534
-@@ -34,7 +34,6 @@
-   -DG_DISABLE_DEPRECATED \
-   -DGDK_DISABLE_DEPRECATED \
-   -DGDK_PIXBUF_DISABLE_DEPRECATED \
--  -DGTK_DISABLE_DEPRECATED \
-   -DGNOME_DISABLE_DEPRECATED
- 
- glademoduledir = $(libdir)/libglade/2.0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/yelp-01-macro-reference-crash.diff	Tue Jul 31 15:51:53 2007 +0000
@@ -0,0 +1,17 @@
+--- yelp-2.18.1.old/src/yelp-man-parser.c	2007-06-13 13:00:49.672288000 +0100
++++ yelp-2.18.1/src/yelp-man-parser.c	2007-06-13 13:00:38.749792000 +0100
+@@ -737,11 +737,10 @@
+ 	if (args && args->data) {
+ 	    basename = g_strrstr((const gchar *)args->data, "/");
+ 
+-	    basename++;
+-	    
+-	    if (basename)
++	    if (basename) {
++		basename++;
+ 		link = g_strdup_printf ("man:%s", basename);
+-	    else {
++	    } else {
+ 		link = g_strdup_printf ("man:%s", (const gchar *)args->data);
+ 		basename = (gchar *)args->data;
+ 	    }

--- a/patches/yelp-01-null-frag-id.diff	Tue Jul 31 14:22:33 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- yelp-2.16.0.old/src/yelp-pager.c	2006-09-18 14:52:04.787196000 +0100
-+++ yelp-2.16.0/src/yelp-pager.c	2006-09-18 14:52:39.983264000 +0100
-@@ -393,7 +393,10 @@
-     const gchar *frag_page_id =
- 	YELP_PAGER_GET_CLASS (pager)->resolve_frag (pager, frag_id);
- 
--    return !strcmp (frag_page_id, page_id);
-+	if (frag_page_id)
-+    	return !strcmp (frag_page_id, page_id);
-+	else
-+		return FALSE;
- }
- 
- const YelpPage *

--- a/patches/yelp-02-empty-contents-list.diff	Tue Jul 31 14:22:33 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- yelp-2.18.0.old/src/yelp-toc-pager.c	2007-04-10 16:47:53.413235000 +0100
-+++ yelp-2.18.0/src/yelp-toc-pager.c	2007-04-10 16:48:36.455479000 +0100
-@@ -904,17 +904,19 @@
- 
- 	/* copy the newly created file to ~/.gnome2/yelp.d/omfindex.xml,
- 	 * overwriting the old one if necessary */
--	result = gnome_vfs_xfer_uri (fromfile, tofile, 
--	                             GNOME_VFS_XFER_DEFAULT,
--			             GNOME_VFS_XFER_ERROR_MODE_ABORT,
--			             GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
--			             NULL, NULL);
-+	if (fromfile && tofile) {
-+		result = gnome_vfs_xfer_uri (fromfile, tofile, 
-+	                             	GNOME_VFS_XFER_DEFAULT,
-+			             	GNOME_VFS_XFER_ERROR_MODE_ABORT,
-+			             	GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-+			             	NULL, NULL);
- 
--	gnome_vfs_uri_unref (fromfile);
--	gnome_vfs_uri_unref (tofile);
-+		gnome_vfs_uri_unref (fromfile);
-+		gnome_vfs_uri_unref (tofile);
- 
--	if (result != GNOME_VFS_OK) 
--	    g_critical ("Unable to copy %s to %s\n", content_list, sk_file);
-+		if (result != GNOME_VFS_OK) 
-+	    	g_critical ("Unable to copy %s to %s\n", content_list, sk_file);
-+	}
- 
- 	if (priv->omf_dirhash)
- 	    g_hash_table_destroy (priv->omf_dirhash);

--- a/patches/yelp-03-macro-reference-crash.diff	Tue Jul 31 14:22:33 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- yelp-2.18.1.old/src/yelp-man-parser.c	2007-06-13 13:00:49.672288000 +0100
-+++ yelp-2.18.1/src/yelp-man-parser.c	2007-06-13 13:00:38.749792000 +0100
-@@ -737,11 +737,10 @@
- 	if (args && args->data) {
- 	    basename = g_strrstr((const gchar *)args->data, "/");
- 
--	    basename++;
--	    
--	    if (basename)
-+	    if (basename) {
-+		basename++;
- 		link = g_strdup_printf ("man:%s", basename);
--	    else {
-+	    } else {
- 		link = g_strdup_printf ("man:%s", (const gchar *)args->data);
- 		basename = (gchar *)args->data;
- 	    }