--- a/ChangeLog	Tue Sep 18 20:54:51 2007 +0000
+++ b/ChangeLog	Tue Sep 18 21:23:38 2007 +0000
@@ -1,3 +1,18 @@
+2007-09-18  Damien Carbery <[email protected]>
+
+	* base-specs/gnome-icon-theme.spec: Bump to 2.20.0. Remove upstream
+	  patch, 03-missing-index.
+	* patches/gnome-icon-theme-03-missing-index.diff: Removed, upstream.
+	* base-specs/gnome-keyring.spec: Bump to 2.20.0. Remove upstream patch,
+	  02-export-symbols. Renumber rest.
+	* patches/gnome-keyring-02-export-symbols.diff: Removed, upstream.
+
+2007-09-18  Damien Carbery <[email protected]>
+
+	* base-specs/gnome-desktop.spec: Bump to 2.20.0.
+	* patches/gnome-desktop-01-jds-about-branding.diff,
+	  patches/gnome-desktop-03-trusted-extensions.diff: Rework.
+
 2007-09-18  Damien Carbery <[email protected]>
 
 	* base-specs/gcalctool.spec: Bump to 5.20.0.

--- a/base-specs/gnome-icon-theme.spec	Tue Sep 18 20:54:51 2007 +0000
+++ b/base-specs/gnome-icon-theme.spec	Tue Sep 18 21:23:38 2007 +0000
@@ -10,12 +10,12 @@
 License:      		GPL
 Group:        		System/GUI/GNOME
 BuildArchitectures:	noarch
-Version:      		2.19.91
+Version:      		2.20.0
 Release:      		1
 Distribution: 		Java Desktop System
 Vendor:       		Sun Microsystems, Inc.
 Summary:      		GNOME Icon Themes
-Source:       		http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
+Source:       		http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
 Source3:		branded-throbber.tar.gz
 Source4:		sun_java.png
 #owner:gman date:2005-04-08 type:branding
@@ -24,8 +24,6 @@
 # run before the module is installed.
 #owner:dcarbery date:2005-10-11 type:branding
 Patch2:			gnome-icon-theme-02-pkgconfig-dir.diff
-#owner:erwannc date:2007-09-13  type:bug bugster:6603213
-Patch3:			gnome-icon-theme-03-missing-index.diff
 URL:          		http://www.gnome.org/
 BuildRoot:    		%{_tmppath}/%{name}-%{version}-build
 Docdir:	      		%{_defaultdocdir}/doc
@@ -48,7 +46,6 @@
 cp %SOURCE4 48x48/apps/
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %ifos linux
@@ -91,6 +88,8 @@
 
 
 %changelog
+* Tue Sep 18 2007 - [email protected]
+- Bump to 2.20.0. Remove upstream patch, 03-missing-index.
 * Tue Aug 28 2007 - [email protected]
 - Bump to 2.19.91.
 * Wed Aug 15 2007 - [email protected]

--- a/base-specs/gnome-keyring.spec	Tue Sep 18 20:54:51 2007 +0000
+++ b/base-specs/gnome-keyring.spec	Tue Sep 18 21:23:38 2007 +0000
@@ -10,18 +10,17 @@
 Name:         gnome-keyring
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.19.91
+# 2.20.0 tarball was released without the ".0" in the name.
+Version:      2.20
 Release:      4
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GNOME Key Ring
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
 #owner:dcarbery date:2007-07-31 type:bug bugzilla:462122
 Patch1:       gnome-keyring-01-strsep.diff
-#owner:halton date:2007-09-05 type:bug bugzilla:473796
-Patch2:       gnome-keyring-02-export-symbols.diff
 #owner:dkenny date:2007-09-13 type:bug bugzilla:476644
-Patch3:       gnome-keyring-03-new-keyring-bug.diff
+Patch2:       gnome-keyring-02-new-keyring-bug.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -70,7 +69,6 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %ifos linux
@@ -128,9 +126,13 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Sep 18 2007 - [email protected]
+- Bump to 2.20.0. Remove upstream patch, 02-export-symbols. Renumber rest.
+
 * Thu Sep 13 2007 - [email protected]
 - Added patch for bugzilla bug: 476644, which presents issues when creating a
   new keyring where non existed before : gnome-keyring-03-new-keyring-bug.diff
+
 * Wed Sep 05 2007 - [email protected]
 - Bump to 2.19.91.
 - Add patch 02-export-symbols for bugzilla #473796

--- a/patches/gnome-desktop-01-jds-about-branding.diff	Tue Sep 18 20:54:51 2007 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff	Tue Sep 18 21:23:38 2007 +0000
@@ -1,6 +1,6 @@
-diff -urN gnome-desktop-2.17.5/Makefile.am gnome-desktop-2.17.5-hacked/Makefile.am
---- gnome-desktop-2.17.5/Makefile.am	2006-04-11 01:17:35.000000000 +1200
-+++ gnome-desktop-2.17.5-hacked/Makefile.am	2006-04-28 12:31:36.869661000 +1200
+diff -urN gnome-desktop-2.20.0/Makefile.am gnome-desktop-2.20.0-hacked/Makefile.am
+--- gnome-desktop-2.20.0/Makefile.am	2006-04-11 01:17:35.000000000 +1200
++++ gnome-desktop-2.20.0-hacked/Makefile.am	2006-04-28 12:31:36.869661000 +1200
 @@ -1,5 +1,10 @@
  ACLOCAL_AMFLAGS = -I m4
  
@@ -20,9 +20,9 @@
 -	gnome-version.xml	\
 +	$(XML_IN_FILES)		\
 +	$(XML_FILES)		\
- 	gnome-desktop.spec.in	\
- 	gnome-desktop.spec	\
  	COPYING-DOCS		\
+ 	HACKING			\
+ 	intltool-extract.in	\
 @@ -19,8 +25,9 @@
  	intltool-update.in	\
  	gnome-doc-utils.make

--- a/patches/gnome-desktop-03-trusted-extensions.diff	Tue Sep 18 20:54:51 2007 +0000
+++ b/patches/gnome-desktop-03-trusted-extensions.diff	Tue Sep 18 21:23:38 2007 +0000
@@ -1,6 +1,6 @@
-diff -urN gnome-desktop-2.19.5/configure.in ../SUNWgnome-panel-2.19.5.hacked/gnome-desktop-2.19.5/configure.in
---- gnome-desktop-2.19.5/configure.in	2006-12-04 17:22:29.361309000 +0000
-+++ ../SUNWgnome-panel-2.19.5.hacked/gnome-desktop-2.17.2/configure.in	2006-12-04 18:48:47.899545000 +0000
+diff -urN gnome-desktop-2.20.0/configure.in ../SUNWgnome-panel-2.20.0.hacked/gnome-desktop-2.20.0/configure.in
+--- gnome-desktop-2.20.0/configure.in	2006-12-04 17:22:29.361309000 +0000
++++ ../SUNWgnome-panel-2.20.0.hacked/gnome-desktop-2.20.0/configure.in	2006-12-04 18:48:47.899545000 +0000
 @@ -113,6 +113,23 @@
  
  PKG_CHECK_MODULES(GNOME_DESKTOP, libxml-2.0 >= $LIBXML_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE)
@@ -22,9 +22,10 @@
 +       GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS -lsecdb"
 +fi
 +
- PKG_CHECK_MODULES(GNOME_ABOUT, libxml-2.0 >= $LIBXML_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED)
+ PKG_CHECK_MODULES(GNOME_ABOUT, libxml-2.0 >= $LIBXML_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED)
  
  dnl gnome-doc-utils stuff
+XXX 
 diff -urN gnome-desktop-2.17.2/libgnome-desktop/Makefile.am ../SUNWgnome-panel-2.17.1.hacked/gnome-desktop-2.17.2/libgnome-desktop/Makefile.am
 --- gnome-desktop-2.17.2/libgnome-desktop/Makefile.am	2006-06-04 11:53:09.000000000 +0000
 +++ ../SUNWgnome-panel-2.17.1.hacked/gnome-desktop-2.17.2/libgnome-desktop/Makefile.am	2006-12-04 16:31:30.993343000 +0000

--- a/patches/gnome-icon-theme-03-missing-index.diff	Tue Sep 18 20:54:51 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-diff -rup /jds/BUILD/SUNWgnome-themes-2.19.92/i386/gnome-icon-theme-2.19.91/index.theme.in gnome-icon-theme/index.theme.in
---- /jds/BUILD/SUNWgnome-themes-2.19.92/i386/gnome-icon-theme-2.19.91/index.theme.in	2007-07-12 14:50:39.000000000 +0200
-+++ gnome-icon-theme/index.theme.in	2007-09-13 17:27:20.394644000 +0200
-@@ -2,7 +2,7 @@
- _Name=GNOME
- _Comment=Default GNOME Theme
- 
--Directories=8x8/emblems,16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/devices,22x22/emblems,22x22/mimetypes,22x22/places,22x22/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic
-+Directories=8x8/emblems,16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/devices,22x22/emblems,22x22/emotes,22x22/mimetypes,22x22/places,22x22/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic
- 
- [8x8/emblems]
- Size=8
-@@ -39,6 +39,11 @@ Size=16
- Context=Emblems
- Type=Fixed
- 
-+[16x16/emotes]
-+Size=16
-+Context=Stock
-+Type=Fixed
-+
- [16x16/filesystems]
- Size=16
- Context=FileSystems
-@@ -164,6 +169,11 @@ Size=22
- Context=Emblems
- Type=Fixed
- 
-+[22x22/emotes]
-+Size=22
-+Context=Stock
-+Type=Fixed
-+
- [22x22/mimetypes]
- Size=22
- Context=MimeTypes
-@@ -209,6 +219,11 @@ Size=24
- Context=Emblems
- Type=Fixed
- 
-+[24x24/emotes]
-+Size=24
-+Context=Stock
-+Type=Fixed
-+
- [24x24/filesystems]
- Size=24
- Context=FileSystems
-@@ -329,6 +344,11 @@ Size=32
- Context=Emblems
- Type=Fixed
- 
-+[32x32/emotes]
-+Size=32
-+Context=Stock
-+Type=Fixed
-+
- [32x32/mimetypes]
- Size=32
- Context=MimeTypes
-@@ -449,6 +469,13 @@ MaxSize=256
- Context=Emblems
- Type=Scalable
- 
-+[scalable/emotes]
-+Size=48
-+MinSize=32
-+MaxSize=256
-+Context=Stock
-+Type=Scalable
-+
- [scalable/mimetypes]
- Size=48
- MinSize=32
-

--- a/patches/gnome-keyring-02-export-symbols.diff	Tue Sep 18 20:54:51 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-Index: gnome-keyring-trunk/library/gnome-keyring-1-uninstalled.pc.in
-===================================================================
---- gnome-keyring-trunk/library/gnome-keyring-1-uninstalled.pc.in	(revision 821)
-+++ gnome-keyring-trunk/library/gnome-keyring-1-uninstalled.pc.in	(working copy)
-@@ -7,5 +7,5 @@
- Description: The GNOME keyring libraries
- Version: @VERSION@
- Requires: glib-2.0
--Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-keyring-common.la ${pc_top_builddir}/${pcfiledir}/libgnome-keyring.la
-+Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-keyring.la
- Cflags: -I${pc_top_builddir}/${pcfiledir}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-keyring-02-new-keyring-bug.diff	Tue Sep 18 21:23:38 2007 +0000
@@ -0,0 +1,13 @@
+diff -up gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c.orig gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c
+--- gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c.orig	2007-08-24 21:29:53.000000000 +0100
++++ gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c	2007-09-13 13:57:12.095464000 +0100
+@@ -715,6 +715,8 @@ check_keyring_default_request (GkrAskReq
+ 			g_warning ("couldn't create default keyring");
+ 			ask->response = GKR_ASK_RESPONSE_FAILURE;
+ 		} else {
++            /* Add to our main list */
++            gkr_keyrings_add (keyring);
+ 			/* Set our newly created keyring as the default */
+ 			gkr_keyrings_set_default (keyring);
+ 		}
+

--- a/patches/gnome-keyring-03-new-keyring-bug.diff	Tue Sep 18 20:54:51 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -up gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c.orig gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c
---- gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c.orig	2007-08-24 21:29:53.000000000 +0100
-+++ gnome-keyring-2.19.91/daemon/gkr-daemon-ops.c	2007-09-13 13:57:12.095464000 +0100
-@@ -715,6 +715,8 @@ check_keyring_default_request (GkrAskReq
- 			g_warning ("couldn't create default keyring");
- 			ask->response = GKR_ASK_RESPONSE_FAILURE;
- 		} else {
-+            /* Add to our main list */
-+            gkr_keyrings_add (keyring);
- 			/* Set our newly created keyring as the default */
- 			gkr_keyrings_set_default (keyring);
- 		}
-