--- a/ChangeLog	Tue Apr 24 04:52:13 2012 +0000
+++ b/ChangeLog	Fri Apr 27 03:21:27 2012 +0000
@@ -1,3 +1,6 @@
+2012-04-27 Arvind Umrao <[email protected]>
+	Added patch xscreensaver-25-bug-7023648.diff
+
 2012-04-23 Ada Luong <[email protected]>
 
         ==== S11U1 build 15 ====

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/xscreensaver-25-bug-7023648.diff	Fri Apr 27 03:21:27 2012 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+7023648 xscreensaver does not allow user to enter password and login w/ sv_SE.ISO8859-01/-15
+*/
+
+---
+ driver/lock-Gtk.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git driver/lock-Gtk.c driver/lock-Gtk.c
+--- driver/lock-Gtk.c
++++ driver/lock-Gtk.c
+@@ -663,6 +663,7 @@ main (int argc, char *argv[])
+   GConfClient *client;
+   const char *modulesptr = NULL;
+   int i;
++  const char *locale = NULL;
+ 
+   gboolean  at_enable  = FALSE; /* accessibility mode enabled ? */
+   Bonobo_ServerInfoList *server_list = NULL;
+@@ -953,6 +954,8 @@ main (int argc, char *argv[])
+   gtk_widget_grab_focus (pwd->user_input_entry);
+ 
+   ioc = g_io_channel_unix_new (0);
++  g_get_charset (&locale);
++  g_io_channel_set_encoding(ioc, locale, NULL);
+   g_io_add_watch (ioc, G_IO_IN | G_IO_HUP, handle_input, pwd);
+ 
+   gtk_main ();
+

--- a/specs/SUNWxscreensaver.spec	Tue Apr 24 04:52:13 2012 +0000
+++ b/specs/SUNWxscreensaver.spec	Fri Apr 27 03:21:27 2012 +0000
@@ -9,7 +9,7 @@
 #
 # includes module(s): xscreensaver, rss-glx
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # packages are under the same license as the packages themselves.
 #
@@ -126,6 +126,8 @@
 Patch23: xscreensaver-23-bug-7136531.diff
 # date:2012-03-28 owner:arvind type:bug bugster:7144354
 patch24: xscreensaver-24-bug-7144354.diff
+#date:2012-04-24 owner:arvind type:bug bugster:7023648
+patch25: xscreensaver-25-bug-7023648.diff
 
 # date:2008-03-07 owner:alanc type:branding
 Patch101: rss-glx-101-matrixview.diff
@@ -176,11 +178,11 @@
 %include default-depend.inc
 %include desktop-incorporation.inc
 Requires: %{name}
-Requires: SUNWcslr
-Requires: SUNWglib2
-Requires: SUNWgtk2
-Requires: SUNWlibmsr
-BuildRequires: SUNWxwplt
+Requires: system/library
+Requires: library/glib2
+Requires: library/desktop/gtk2
+Requires: system/library/math
+BuildRequires: compatibility/packages/SUNWxwplt
 
 %package hacks-gl
 IPS_package_name:        %{pkg5_name_hacks_gl}
@@ -194,13 +196,12 @@
 %include default-depend.inc
 %include desktop-incorporation.inc
 Requires: %{name}
-Requires: SUNWcslr
-Requires: SUNWglib2
-Requires: SUNWgtk2
-Requires: SUNWlibmsr
-Requires: SUNWxorg-mesa
-BuildRequires: SUNWxwplr
-BuildRequires: SUNWxwplt
+Requires: system/library
+Requires: library/glib2
+Requires: library/desktop/gtk2
+Requires: system/library/math
+Requires: x11/library/mesa
+BuildRequires: compatibility/packages/SUNWxwplt
 %define opengl_dir /usr
 
 %package -n SUNWrss-glx
@@ -215,14 +216,13 @@
 %include default-depend.inc
 %include desktop-incorporation.inc
 Requires: %{name}
-Requires: SUNWbzip
-Requires: SUNWcslr
-Requires: SUNWimagick
-Requires: SUNWlibC
-Requires: SUNWlibmsr
-Requires: SUNWxorg-mesa
-BuildRequires: SUNWxwplr
-BuildRequires: SUNWxwplt
+Requires: compress/bzip2
+Requires: system/library
+Requires: image/imagemagick
+Requires: system/library
+Requires: system/library/math
+Requires: x11/library/mesa
+BuildRequires: compatibility/packages/SUNWxwplt
 
 %package l10n
 Summary:                 XScreenSaver - l10n content
@@ -256,6 +256,7 @@
 %patch22 -p0
 %patch23 -p0
 %patch24 -p0
+%patch25 -p0
 
 chmod a+x install-sh configure
 
@@ -626,6 +627,8 @@
 %attr (-, root, other) /usr/share/locale
 
 %changelog
+* Tue Apr 24 2012 [email protected]
+Added patch xscreensaver-25-bug-7023648.diff
 * Wed Mar 28 2012 [email protected]
   Added patch xscreensaver-23-bug-7136531.diff
   Added patch xscreensaver-24-bug-7144354.diff