--- a/ChangeLog	Wed Jun 18 14:17:25 2008 +0000
+++ b/ChangeLog	Wed Jun 18 14:21:08 2008 +0000
@@ -1,3 +1,8 @@
+2008-06-18  Jeff Cai<[email protected]>
+
+	* SUNWgnome-libs.spec:Ship some new files.
+	* base-specs/gnome-keyring.spec:Bump to 2.22.2.
+
 2008-06-18  Damien Carbery <[email protected]>
 
 	* SUNWgnome-component.spec: Add Build/Requires SUNWdbus-bindings/-devel

--- a/SUNWgnome-libs.spec	Wed Jun 18 14:17:25 2008 +0000
+++ b/SUNWgnome-libs.spec	Wed Jun 18 14:21:08 2008 +0000
@@ -246,9 +246,14 @@
 %{_libdir}/lib*.so*
 %{_libdir}/bonobo/monikers/*.so
 %{_libdir}/bonobo/servers/*.server
+%{_libdir}/gnome-keyring/*
 %{_libdir}/libglade/2.0/*.so
 %{_libexecdir}/gnome-keyring-ask
 %dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_datadir}/dbus-1
+%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
+%{_datadir}/dbus-1/services/org.gnome.keyring.service
+
 %{_datadir}/gnome-2.0/*
 %{_datadir}/help
 %{_datadir}/librarian
@@ -298,6 +303,7 @@
 %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas
 %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnail_cache.schemas
 %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas
+%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
 %{_sysconfdir}/sound
 
 %if %build_l10n
@@ -308,6 +314,8 @@
 %endif
 
 %changelog
+* Wed Jun 18 2008 - [email protected]
+  Bump gnome-keyring and ship some new files.
 * Tue Jun 17 2008 - [email protected]
 - Update %files, removing %{_libdir}/gtk-2.0/2.*.*/filesystems/lib*.so* as those
   files are no longer installed.

--- a/base-specs/gnome-keyring.spec	Wed Jun 18 14:17:25 2008 +0000
+++ b/base-specs/gnome-keyring.spec	Wed Jun 18 14:21:08 2008 +0000
@@ -12,19 +12,15 @@
 Group:        System/GUI/GNOME
 # NOTE: Do not bump. Leave at 2.20.3 because the AM_PATH_LIBTASN1 macro is
 #       unavailable.
-Version:      2.20.3
+Version:      2.22.2
 Release:      4
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GNOME Key Ring
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
-#owner:dcarbery date:2007-07-31 type:bug bugzilla:462122
-Patch1:       gnome-keyring-01-strsep.diff
-#owner:dcarbery date:2008-02-14 type:bug bugzilla:??????
-Patch2:       gnome-keyring-02-gulong2gsize.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -71,8 +67,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 %ifos linux
@@ -138,6 +132,8 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Jun 18 2008 - [email protected]
+- Bump to 2.22.2. Remove -01-strsep, -02-gulong2gsize
 * Wed Apr 16 2008 - [email protected]
 - Add 'make check' call after %install.
 * Thu Feb 14 2008 - [email protected]