--- a/ChangeLog	Wed Aug 15 14:25:01 2007 +0000
+++ b/ChangeLog	Wed Aug 15 14:50:32 2007 +0000
@@ -1,3 +1,19 @@
+2007-08-14  Damien Carbery <[email protected]>
+
+	* base-specs/java-access-bridge.spec: Bump to 1.19.2.
+	* base-specs/gcalctool.spec: Bump to 5.19.90.
+	* base-specs/gnome-utils.spec: Bump to 2.19.90.
+	* base-specs/sound-juicer.spec: Bump to 2.19.3.
+	* base-specs/gnome-keyring.spec: Bump to 2.19.90. Remove upstream
+	  patches, 01-err_to_g_error and 02-string_header.
+	* patches/gnome-keyring-01-err_to_g_error.diff,
+	  patches/gnome-keyring-02-string_header.diff: Removed, upstream.
+	* patches/gnome-keyring-01-strsep.diff: Renamed from 03. Remove one
+	  upstream chunk.
+	* base-specs/gnome-games.spec: Bump to 2.19.90b. Remove upstream patch,
+	  01-build-gnometris.
+	* patches/gnome-games-01-build-gnometris.diff: Removed, upstream.
+
 2007-08-14  Damien Carbery <[email protected]>
 
 	* closed/SUNWtgnome-tsoljdsdevmgr.spec: Only apply the patch to sparc

--- a/base-specs/gcalctool.spec	Wed Aug 15 14:25:01 2007 +0000
+++ b/base-specs/gcalctool.spec	Wed Aug 15 14:50:32 2007 +0000
@@ -11,7 +11,7 @@
 Name:         gcalctool
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      5.19.6
+Version:      5.19.90
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -109,6 +109,9 @@
 %{_mandir}/man1/
 
 %changelog
+* Wed Aug 15 2007 - [email protected]
+- Bump to 5.19.90.
+
 * Mon Jul 30 2007 - [email protected]
 - Bump to 5.19.6. Remove upstream patch, 01-gtk-tooltips.
 

--- a/base-specs/gnome-games.spec	Wed Aug 15 14:25:01 2007 +0000
+++ b/base-specs/gnome-games.spec	Wed Aug 15 14:50:32 2007 +0000
@@ -10,7 +10,7 @@
 Name:         gnome-games
 License:      GPL
 Group:        Amusements/Games
-Version:      2.19.6
+Version:      2.19.90b
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -141,6 +141,8 @@
 %config %{_sysconfdir}/sound/events/*
 
 %changelog
+* Wed Aug 15 2007 - [email protected]
+- Bump to 2.19.90b. Remove upstream patch, 01-build-gnometris.
 * Mon Jul 30 2007 - [email protected]
 - Bump to 2.19.6. Remove upstream patches, 01-strrchr and 03-ggz-signed-char.
   Renumber remainder.

--- a/base-specs/gnome-keyring.spec	Wed Aug 15 14:25:01 2007 +0000
+++ b/base-specs/gnome-keyring.spec	Wed Aug 15 14:50:32 2007 +0000
@@ -10,18 +10,14 @@
 Name:         gnome-keyring
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.19.6.1
+Version:      2.19.90
 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
-#owner:dcarbery date:2007-07-31 type:bug bugzilla:462114
-Patch1:       gnome-keyring-01-err_to_g_error.diff
-#owner:dcarbery date:2007-07-31 type:bug bugzilla:462118
-Patch2:       gnome-keyring-02-string_header.diff
 #owner:dcarbery date:2007-07-31 type:bug bugzilla:462122
-Patch3:       gnome-keyring-03-strsep.diff
+Patch1:       gnome-keyring-01-strsep.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -69,8 +65,6 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %ifos linux
@@ -127,6 +121,10 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Aug 15 2007 - [email protected]
+- Bump to 2.19.90. Remove upstream patches, 01-err_to_g_error and
+  02-string_header.
+
 * Mon Jul 30 2007 - [email protected]
 - Add 3 patches, 01-err_to_g_error, 02-string_header and 03-strsep to fix
   Solaris specific build issues.

--- a/base-specs/gnome-utils.spec	Wed Aug 15 14:25:01 2007 +0000
+++ b/base-specs/gnome-utils.spec	Wed Aug 15 14:50:32 2007 +0000
@@ -11,12 +11,12 @@
 Name:         gnome-utils
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.18.1
+Version:      2.19.90
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Basic Utilities for the GNOME 2.0 Desktop
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.19/%{name}-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 # date:2005-05-02 type:bug bugster:6222777 owner:mattman bugzilla:310112
 Patch1:       gnome-utils-01-gfloppy-permission.diff
@@ -154,6 +154,9 @@
 %{_libdir}/pkgconfig
 
 %changelog
+* Wed Aug 15 2007 - [email protected]
+- Bump to 2.19.90.
+
 * Mon Mar 16 2007 - [email protected]
 - Bump to 2.18.1.
 

--- a/base-specs/java-access-bridge.spec	Wed Aug 15 14:25:01 2007 +0000
+++ b/base-specs/java-access-bridge.spec	Wed Aug 15 14:50:32 2007 +0000
@@ -10,7 +10,7 @@
 Name:         java-access-bridge
 License:      GPL
 Group:        System/Libraries/GNOME
-Version:      1.19.1
+Version:      1.19.2
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -106,6 +106,8 @@
 
 
 %changelog
+* Wed Aug 15 2007 - [email protected]
+- Bump to 1.19.2.
 * Tue Jul 03 2007 - [email protected]
 - Bump to 1.19.1.
 * Wed Mar 07 2007 - [email protected]

--- a/base-specs/sound-juicer.spec	Wed Aug 15 14:25:01 2007 +0000
+++ b/base-specs/sound-juicer.spec	Wed Aug 15 14:50:32 2007 +0000
@@ -11,7 +11,7 @@
 Name:         sound-juicer
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.19.2
+Version:      2.19.3
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -104,6 +104,9 @@
 %{_datadir}/sound-juicer
 
 %changelog
+* Wed Aug 15 2007 - [email protected]
+- Bump to 2.19.3.
+
 * Mon Jun 18 2007 - [email protected]
 - Bump to 2.19.2.
 

--- a/patches/gnome-games-01-build-gnometris.diff	Wed Aug 15 14:25:01 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
---- gnome-games-2.19.3/gnometris/renderer.h.orig	2007-06-11 11:55:12.541569766 +0100
-+++ gnome-games-2.19.3/gnometris/renderer.h	2007-06-11 11:56:05.971686236 +0100
-@@ -70,7 +70,7 @@
-     virtual void drawCell (cairo_t * cr, gint x, gint y);
- 
- private:
--  const static double border = 0.2;
-+  double border;
-   void drawInnerCorner (cairo_t * cr);
-   void drawOuterCorner (cairo_t * cr);
-   void drawHEdge (cairo_t * cr);
---- gnome-games-2.19.3/gnometris/renderer.cpp.orig	2007-06-11 11:56:33.065386115 +0100
-+++ gnome-games-2.19.3/gnometris/renderer.cpp	2007-06-11 11:57:14.146934413 +0100
-@@ -159,6 +159,7 @@
- 
- void JoinedUp::drawInnerCorner (cairo_t *cr)
- {
-+	border = 0.2;
-         cairo_move_to (cr, 0, 0);
-         cairo_line_to (cr, border, border);
-         cairo_line_to (cr, border, 0);
-@@ -169,6 +170,7 @@
- 
- void JoinedUp::drawOuterCorner (cairo_t *cr)
- {
-+	border = 0.2;
-         cairo_move_to (cr, 0, 0.5);
-         cairo_line_to (cr, 0, 0);
-         cairo_line_to (cr, 0.5, 0);
-@@ -182,6 +184,7 @@
- 
- void JoinedUp::drawHEdge (cairo_t *cr)
- {
-+	border = 0.2;
-         cairo_move_to (cr, 0, 0);
-         cairo_line_to (cr, 0.5, 0);
-         cairo_move_to (cr, 0, border);
-@@ -191,6 +194,7 @@
- 
- void JoinedUp::drawVEdge (cairo_t *cr)
- {
-+	border = 0.2;
-         cairo_move_to (cr, 0, 0);
-         cairo_line_to (cr, 0, 0.5);
-         cairo_move_to (cr, border, 0);

--- a/patches/gnome-keyring-01-err_to_g_error.diff	Wed Aug 15 14:25:01 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
---- gnome-keyring-2.19.6.1/ui/gkr-ask-tool.c.orig	2007-07-31 12:16:13.384242432 +0100
-+++ gnome-keyring-2.19.6.1/ui/gkr-ask-tool.c	2007-07-31 12:21:47.646855154 +0100
-@@ -28,7 +28,6 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- 
--#include <err.h>
- #include <stdio.h>
- #include <string.h>
- #include <locale.h>
-@@ -215,8 +214,10 @@
- 	int row;
- 
- 	value = g_key_file_get_value (input_data, "general", "title", NULL);
--	if (!value)
--		err (1, "no 'title' field in input data");
-+	if (!value) {
-+		fprintf(stderr, "no 'title' field in input data");
-+		exit(1);
-+	}
- 	dialog = gtk_dialog_new_with_buttons (value, NULL, 0, NULL, NULL);
- 	g_free (value);
- 	
-@@ -263,8 +264,10 @@
- 	                  0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
- 	
- 	value = g_key_file_get_value (input_data, "general", "primary", NULL);
--	if (!value)
--		err (1, "no 'primary' field in input data");
-+	if (!value) {
-+		fprintf(stderr, "no 'primary' field in input data");
-+		exit(1);
-+	}
- 	value2 = g_key_file_get_value (input_data, "general", "secondary", NULL);
- 
- 	message = create_markup (value, value2);
-@@ -386,8 +389,10 @@
- 	check = NULL;
- 	if (g_key_file_get_boolean (input_data, "check", "check-enable", NULL)) {
- 		value = g_key_file_get_value (input_data, "check", "check-text", NULL);
--		if (!value)
--			err (1, "'check-enable' set, but no 'check-text'");
-+		if (!value) {
-+			fprintf(stderr, "'check-enable' set, but no 'check-text'");
-+			exit(1);
-+		}
- 		gtk_table_resize (GTK_TABLE (ptable), ++row, 2);
- 		check = gtk_check_button_new_with_mnemonic (value);
- 		gtk_table_attach_defaults (GTK_TABLE (ptable), check,  
-@@ -640,8 +645,10 @@
- 	ret = g_key_file_load_from_data (input_data, data, strlen (data), G_KEY_FILE_NONE, &error);
- 	g_free (data);
- 
--	if (!ret) 
--		err (1, "couldn't parse dialog instructions: %s", error->message);
-+	if (!ret) {
-+		fprintf(stderr, "couldn't parse dialog instructions: %s", error->message);
-+		exit(1);
-+	}
- 
- 	prepare_dialog ();
- 	
-@@ -649,8 +656,10 @@
- 	data = g_key_file_to_data (output_data, &length, &error);
- 	g_key_file_free (output_data);
- 	
--	if (!data)
--		err (1, "couldn't format dialog response: %s", error->message); 
-+	if (!data) {
-+		fprintf(stderr, "couldn't format dialog response: %s", error->message); 
-+		exit(1);
-+	}
- 	
- 	write_all_output (data, length);
- 	g_free (data);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-keyring-01-strsep.diff	Wed Aug 15 14:50:32 2007 +0000
@@ -0,0 +1,45 @@
+--- gnome-keyring-2.19.90/pam/gkr-pam-module.c.orig	2007-07-31 12:44:45.789097240 +0100
++++ gnome-keyring-2.19.90/pam/gkr-pam-module.c	2007-07-31 14:02:11.583853060 +0100
+@@ -661,7 +662,7 @@
+ 	return args;
+ }
+ 
+-PAM_EXTERN int
++int
+ pam_sm_authenticate (pam_handle_t *ph, int unused, int argc, const char **argv)
+ {
+ 	struct passwd *pwd;
+@@ -717,13 +718,13 @@
+ 	return PAM_SUCCESS;
+ }
+ 
+-PAM_EXTERN int
++int
+ pam_sm_open_session (pam_handle_t *ph, int flags, int argc, const char **argv)
+ {
+ 	return PAM_SUCCESS;
+ }
+ 
+-PAM_EXTERN int
++int
+ pam_sm_close_session (pam_handle_t *ph, int flags, int argc, const char **argv)
+ {
+ 	struct passwd *pwd;
+@@ -749,7 +750,7 @@
+ 	return PAM_SUCCESS; 
+ }
+ 
+-PAM_EXTERN int
++int
+ pam_sm_setcred (pam_handle_t * ph, int flags, int argc, const char **argv)
+ {
+ 	return PAM_SUCCESS;	
+@@ -828,7 +829,7 @@
+ 	return PAM_SUCCESS;
+ }
+ 
+-PAM_EXTERN int
++int
+ pam_sm_chauthtok (pam_handle_t *ph, int flags, int argc, const char **argv)
+ {
+ 	const char *user;

--- a/patches/gnome-keyring-02-string_header.diff	Wed Aug 15 14:25:01 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- gnome-keyring-2.19.6.1/pam/gkr-pam-client.c.orig	2007-07-31 12:24:30.513946708 +0100
-+++ gnome-keyring-2.19.6.1/pam/gkr-pam-client.c	2007-07-31 12:24:42.296839262 +0100
-@@ -39,6 +39,7 @@
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <syslog.h>
- #include <unistd.h>
- 
---- gnome-keyring-2.19.6.1/pam/gkr-pam-module.c.orig	2007-07-31 12:44:45.789097240 +0100
-+++ gnome-keyring-2.19.6.1/pam/gkr-pam-module.c	2007-07-31 12:47:52.997132367 +0100
-@@ -34,6 +34,7 @@
- #include "library/gnome-keyring-result.h"
- #include "library/gnome-keyring-opcodes.h"
- 
-+#include <security/pam_appl.h>
- #include <security/pam_modules.h>
- 
- #include <sys/types.h>
---- gnome-keyring-2.19.6.1/pam/gkr-pam.h.orig	2007-07-31 12:25:04.405996186 +0100
-+++ gnome-keyring-2.19.6.1/pam/gkr-pam.h	2007-07-31 12:29:21.413600139 +0100
-@@ -29,6 +29,12 @@
- #include "library/gnome-keyring-opcodes.h"
- #include "library/gnome-keyring-result.h"
- 
-+#ifdef __sun
-+#ifndef LOG_AUTHPRIV
-+#define LOG_AUTHPRIV    LOG_AUTH
-+#endif
-+#endif
-+
- #define GKR_LOG_ERR     (LOG_ERR | LOG_AUTHPRIV)
- #define GKR_LOG_WARN    (LOG_WARNING | LOG_AUTHPRIV)
- #define GKR_LOG_NOTICE  (LOG_NOTICE | LOG_AUTHPRIV)

--- a/patches/gnome-keyring-03-strsep.diff	Wed Aug 15 14:25:01 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
---- gnome-keyring-2.19.6.1/pam/gkr-pam-module.c.orig	2007-07-31 12:44:45.789097240 +0100
-+++ gnome-keyring-2.19.6.1/pam/gkr-pam-module.c	2007-07-31 14:02:11.583853060 +0100
-@@ -123,7 +124,7 @@
- 	assert (lines);
- 	
- 	/* Call cb for each line in the text block */
--	while ((line = strsep (&lines, "\n")) != NULL) {
-+	for (line = strtok(lines, "\n"); line; line = strtok(NULL, "\n")) {
- 		 ret = (cb) (line, arg);
- 		 if (ret != PAM_SUCCESS)
- 		 	return ret;
-@@ -661,7 +662,7 @@
- 	return args;
- }
- 
--PAM_EXTERN int
-+int
- pam_sm_authenticate (pam_handle_t *ph, int unused, int argc, const char **argv)
- {
- 	struct passwd *pwd;
-@@ -717,13 +718,13 @@
- 	return PAM_SUCCESS;
- }
- 
--PAM_EXTERN int
-+int
- pam_sm_open_session (pam_handle_t *ph, int flags, int argc, const char **argv)
- {
- 	return PAM_SUCCESS;
- }
- 
--PAM_EXTERN int
-+int
- pam_sm_close_session (pam_handle_t *ph, int flags, int argc, const char **argv)
- {
- 	struct passwd *pwd;
-@@ -749,7 +750,7 @@
- 	return PAM_SUCCESS; 
- }
- 
--PAM_EXTERN int
-+int
- pam_sm_setcred (pam_handle_t * ph, int flags, int argc, const char **argv)
- {
- 	return PAM_SUCCESS;	
-@@ -828,7 +829,7 @@
- 	return PAM_SUCCESS;
- }
- 
--PAM_EXTERN int
-+int
- pam_sm_chauthtok (pam_handle_t *ph, int flags, int argc, const char **argv)
- {
- 	const char *user;