--- a/ChangeLog	Tue Mar 29 04:17:22 2011 +0000
+++ b/ChangeLog	Tue Mar 29 09:22:44 2011 +0000
@@ -1,3 +1,23 @@
+2011-03-29  Li Yuan  <[email protected]>
+
+	* base-specs/control-center.spec:
+	* patches/control-center-09-remove-gok.diff:
+	* base-specs/gdm.spec:
+	* patches/gdm-33-remove-gok.diff:
+	Add patches to remove gok entries.
+	* manpages/Makefile:
+	* manpages/man1/gok.1:
+	Remove gok manpages.
+	* base-specs/gok.spec:
+	* copyright/SUNWgnome-a11y-gok.copyright:
+	* patches/gok-01-linux-apps.diff:
+	* patches/gok-01-solaris-apps.diff:
+	* patches/gok-02-langdirs.diff:
+	* patches/gok-03-omf.diff:
+	* specs/SUNWgnome-a11y-gok.spec:
+	Remove gok related files.
+	CR7013886.
+
 2011-03-29  Brian Cameron  <[email protected]>
 
 	* ext-sources/SUNWgnome-system-tools-exec_attr: Correct typo.  Fixes

--- a/base-specs/control-center.spec	Tue Mar 29 04:17:22 2011 +0000
+++ b/base-specs/control-center.spec	Tue Mar 29 09:22:44 2011 +0000
@@ -47,6 +47,8 @@
 Patch7:      control-center-07-Wall.diff
 # date:2009-08-14 owner:stephen type:branding bugster:6865681
 Patch8:	     control-center-08-trusted-extensions.diff
+# date:2011-03-29 owner:liyuan type:bug bugster:7013886
+Patch9:      control-center-09-remove-gok.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -119,6 +121,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %ifos linux
@@ -227,6 +230,8 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Mar 29 2011 - [email protected]
+- Add patch control-center-09-remove-gok.diff to remove gok entry.
 * Mon Aug 02 2010 - [email protected]
 - Replace Patch1: control-center-01-no-libgnomekbd.diff with Patch1: 
   control-center-01-remote-x-no-kbd-layout.diff and remove gswitchit flag.

--- a/base-specs/gdm.spec	Tue Mar 29 04:17:22 2011 +0000
+++ b/base-specs/gdm.spec	Tue Mar 29 09:22:44 2011 +0000
@@ -100,6 +100,8 @@
 Patch31:      gdm-31-fix-version.diff
 # date:2010-12-14 owner:yippi type:feature bugster:6998997 bugzilla:621581
 Patch32:      gdm-32-logindevperm.diff
+# date:2011-03-29 owner:liyuan type:bug bugster:7013886
+Patch33:      gdm-33-remove-gok.diff
 URL:          http://projects.gnome.org/gdm/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
@@ -143,6 +145,7 @@
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 cp %SOURCE1 gui/simple-greeter
 cp %SOURCE2 gui/simple-greeter
@@ -254,6 +257,8 @@
 %{_localstatedir}/lib/gdm
 
 %changelog
+* Tue Mar 29 2011 - [email protected]
+- Add patch gdm-33-remove-gok.diff to remove gok desktop file.
 * Tue Dec 14 2010 - [email protected]
 - Add patches gdm-31-fix-version.diff to fix upstream bug #636662 and
   gdm-32-logindevperm.diff to fix bugster CR #6998997.

--- a/base-specs/gok.spec	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,422 +0,0 @@
-#
-# spec file for package gok
-#
-# Copyright (c) 2005 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-%define owner padraig
-#
-
-%define OSR LFI#105446 (gnome Exec. summary):n/a
-
-%include l10n.inc
-Name:         gok
-License:      LGPL v2
-Group:        System/Libraries
-Version:      2.30.1
-Release:      1 
-Distribution: Java Desktop System
-Vendor:       Gnome Community
-Summary:      GNOME On-screen Keyboard
-Source:       http://ftp.gnome.org/pub/GNOME/sources/gok/2.30/%{name}-%{version}.tar.bz2
-Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
-%if %build_l10n
-Source2:                 l10n-configure.sh
-%endif
-%ifos linux
-#owner:padraig date:2004-08-17 type:branding
-Patch1:       gok-01-linux-apps.diff
-%else
-#owner:padraig date:2004-08-17 type:branding
-Patch1:       gok-01-solaris-apps.diff
-%endif
-#owner:davelam date:2009-10-26 type:branding
-Patch2:       gok-02-langdirs.diff
-#owner:yippi date:2010-10-05 type:bug doo:13679
-Patch3:       gok-03-omf.diff
-URL:          http://developer.gnome.org/projects/gap/
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Docdir:       %{_defaultdocdir}/%{name}
-Autoreqprov:  on
-Prereq:	      /sbin/ldconfig
-Prereq:       GConf
-
-%define gtk2_version 2.2.4
-%define libgnomeui_version 2.4.0
-%define atk_version 1.6.0
-%define gail_version 1.5.7
-%define at_spi_version 1.5.4
-%define gnome_speech_version 0.3.5
-%define intltool_version 0.31.3
-
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: gail-devel >= %{gail_version}
-BuildRequires: at-spi-devel >= %at_spi_version
-BuildRequires: gnome-speech-devel >= %gnome_speech_version
-BuildRequires: esound-devel
-BuildRequires: intltool >= %intltool_version
-Requires:      gtk2 >= %{gtk2_version}
-Requires:      libgnomeui >= %{libgnomeui_version}
-Requires:      gail >= %{gail_version}
-Requires:      at-spi >= %at_spi_version
-Requires:      gnome-speech >= %gnome_speech_version
-Requires:      esound
-
-%description
-The GNOME On-screen Keyboard (GOK) is a dynamic on-screen keyboard for UNIX
-and UNIX-like operating systems.  It features Direct Selection, Dwell
-Selection, Automatic Scanning and Inverse Scanning access methods and
-includes word completion.
-
-%prep
-%setup -q
-m4 gok-with-references.schemas.m4 > gok-with-references.schemas.in
-%if %build_l10n
-bzcat %SOURCE1 | tar xf -
-cd po-sun; make; cd ..
-%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-%build
-%ifos linux
-if [ -x /usr/bin/getconf ]; then
-  CPUS=`getconf _NPROCESSORS_ONLN`
-fi
-%else
-  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-  # Hardcode 1 to overcome the 'dir exists' intermittent build error.
-  CPUS=1
-%endif
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-  CPUS=1
-fi
-
-libtoolize --force
-intltoolize --copy --force --automake
-
-%if %build_l10n
-bash -x %SOURCE2 --enable-copyright
-%endif
-
-aclocal $ACLOCAL_FLAGS
-automake -a -c -f
-autoconf
-CFLAGS="$RPM_OPT_FLAGS"			\
-./configure --prefix=%{_prefix}			\
-            --sysconfdir=%{_sysconfdir}		\
-	    --libdir=%{_libdir}         	\
-	    --bindir=%{_bindir}         	\
-	    --mandir=%{_mandir}			\
-	    --enable-xevie=no			\
-            --disable-gtk-doc
-make
-
-%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-
-# Remove unwanted files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/var
-rm -rf $RPM_BUILD_ROOT%{_prefix}/share/gtk-doc
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gok.schemas"
-for S in $SCHEMAS; do
-        gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%{_bindir}/gok
-%{_bindir}/create-branching-keyboard
-%{_libdir}/bonobo/servers/*.server
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/applications/*
-%{_datadir}/gok
-%{_datadir}/pixmaps/*
-%{_datadir}/gnome/help/gok/*
-%{_datadir}/locale/*/*/*
-%{_datadir}/omf/gok/*.omf
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_mandir}/man1/*
-
-%changelog
-* Wed Jan 19 2011 - [email protected]
-- Set License to LGPL v2
-* Wed Oct 20 2010 - [email protected]
-- Bump to 2.30.1.
-* Tue Oct 05 2010 - [email protected]
-- Add patch gok-03-omf.diff so that the GOK help works in yelp.
-* Tue Mar 30 2010 - [email protected]
-- Bump to 2.30.0.
-* Mon Oct 26 2009 - [email protected]
-- Added 02-langdirs.diff to fix configure issue.
-* Tue Oct 20 2009 - [email protected]
-- Bump to 2.28.1
-* Wed Sep 23 2009 - [email protected]
-- Bump to 2.28.0
-* Tue Sep 08 2009 - [email protected]
-- Bump to 2.27.92
-* Wed Aug 26 2009 - [email protected]
-- Bump to 2.27.91.
-* Tue Aug 11 2009 - [email protected]
-- Bump to 2.27.90.
-* Tue Jul 28 2009 - [email protected]
-- Bump to 2.27.5.
-* Sun Jul 26 2009 - [email protected]
-- Bump to 2.27.4.
-* Tue Jun 16 2009 - [email protected]
-- Bump to 2.27.3.
-* Mon Jun 15 2009 - [email protected]
-- Bump to 2.27.2.
-* Tue Mar 24 2009 - [email protected]
-- Remove patch build-intltool.diff. Fixes bugzilla 542061.
-* Tue Mar 17 2009 - [email protected]
-- Bump to 2.26.0
-* Tue Feb 17 2009 - [email protected]
-- Bump to 2.25.91
-* Thu Feb 05 2009 - [email protected]
-- Bump to 2.25.90.
-* Thu Feb 05 2008 - [email protected]
-- Disable xevie. Bug #6801596.
-* Thu Jan 22 2009 - [email protected]
-- Bump to 2.25.3.
-* Thu Dec 11 2008 - [email protected]
-- Removed upstream patch gok-03-fix-restart.diff.
-* Wed Dec 03 2008 - [email protected]
-- Bump to 2.25.2
-* Thu Oct 09 2008 - [email protected]
-- Removed patch gok-02-menu-entry.diff, no longer required.
-* Mon Sep 29 2008 - [email protected]
-- Bump to 2.24.0.
-* Mon Tue 08 2008 - [email protected]
-- Correct download URL
-* Mon Sep 01 2008 - [email protected]
-- Bump to 2.23.91.
-* Fri Aug 22 2008 - [email protected]
-- Rename dot-desktop.diff to menu-entry.diff.
-* Tue Jul 15 2008 - [email protected]
-- Bump to 1.4.0, rework gok-03-build-intltool.diff
-* Tue Mar 04 2008 - [email protected]
-- Add gok-03-build-intltool.diff to fix build failure caused by 
-  bugzilla 487817.
-* Fri Oct 19 2007 - [email protected]
-- Bump to 1.3.7.
-* Tue Oct 09 2007 - [email protected]
-- Added patch gok-02-dot-desktop.diff
-* Wed Sep 19 2007 - [email protected]
-- Bump to 1.3.4.
-* Thu Sep 06 2007 - [email protected]
-- Bump to 1.3.3.
-* Mon Aug 27 2007 - [email protected]
-- Bump to 1.3.2. Remove upstream patch 02-no-login-warn.
-* Tue Jul 10 2007 - [email protected]
-- Bump to 1.3.1.
-* Mon May 28 2007 - [email protected]
-- Remove upstream patches, 02-g11n-i18n-ui and 03-menu-comment. Rename rest.
-* Mon May 28 2007 - [email protected]
-- Bump to 1.2.5.
-* Mon Mar 05 2007 - [email protected]
-- Bump to 1.2.3. Remove upstream patch gok-05-fixlogin.diff.
-* Tue Feb 27 2007 - [email protected]
-- Fix patch comments.
-* Tue Feb 13 2007 - [email protected]
-- Add l10n tarball.
-* Fri Feb 09 2007 - [email protected]
-- Fix patch 05-fixlogin so it applies with -p1
-* Tue Jan 30 2007 - [email protected]
-- Add patch, 05-fixlogin, to fix #383514.
-* Mon Jan 22 2007 - [email protected]
-- Bump to 1.2.1.
-* Fri Aug 25 2006 - [email protected]
-- Bump to 1.2.0.
-* Fri Jul 21 2006 - [email protected]
-- Bump to 1.1.1.
-* Mon Jul 03 2006 - [email protected]
-- Redo patch 3 (gok.desktop.in) to *not* point at /usr/sfw as /usr is new 
-  location. Rename patch (sfw-path to menu-comment) to reflect change. #6446011
-* Tue May 23 2006 - [email protected]
-- Bump to 1.0.10
-* Thu Apr 27 2006 - [email protected]
-- Bump to 1.0.8.
-* Tue Mar 13 2006 - [email protected]
-- Bump to 1.0.7.
-* Tue Feb 14 2006 - [email protected]
-- Bump to 1.0.6.
-- Remove upstream patch, dialog-container-add-children.
-* Fri Dec 02 2005 - [email protected]
-- Added gok-05-sfw-path.diff to use the absolute path of the executable 
-  in the .desktop file as usr/sfw/bin should not be included in $PATH.
-  Fixes bug #6345489.
-* Tue Nov 29 2005 - [email protected]
-- remove javahelp stuff
-* Fri Jul 29 2005 - [email protected]
-- Set CPUS to 1 on Solaris to fix intermittent 'dir exists' build error.
-* Fri Jun 03 2005 - [email protected]
-- Added gok-09-no-login-warn-6279448.diff, to fix stopper #6279448,
-  which impaired accessible login.
-* Fri May 20 2005 - [email protected]
-- Added gok-05-dialog-container-add-children.diff, to fix issue with 
-  StarOffice installer.
-* Wed May 18 2005 - [email protected]
-- Added gok-04-menu-doubleaction-patch.diff to fix StarOffice and 
-  Java double activation of menus.
-* Wed May 18 2005 - [email protected]
-- Added gok-03-help-input-devices.diff to fix bugzilla #304524.
-- Also fixes the missing corepointer-warning dialog problem discovered 
-  with dwell mode, today.
-* Mon May 16 2005 - [email protected]
-- Revised gok-01-jdsapps.diff to fix bug #6264341.
-* Fri May 06 2005 - [email protected]
-- Revved to 1.0.5 - workaround for bug #6222814.
-- Removed patch gok-03-primary-container.diff, now in tarball.
-* Fri May 06 2005 - [email protected]
-- Added patch gok-03-primary-container.diff, bugfix for #6238185.
-* Thu Apr 28 2005 - [email protected]
-- Revved to 1.0.4, bugfix for #6244239.
-* Wed Mar 23 2005 - [email protected]
-- Revved to 1.0.3, bugfixes for 
-  and bugzilla #168093, #168405, #160726, #169761, #170347,
-  #171231.
-* Fri Mar 11 2005 - [email protected]
-- Bring back Requires and BuildRequires.
-* Wed Feb 16 2005 - [email protected]
-- Updating l10n tarball rev to latest version (1.12)
-* Fri Feb 11 2005 - [email protected]
-- Revved to 0.12.4, bugfixes for input device autodetection, 
-  and final strings.
-- Removed patch gok-09-toggle-button.diff, as it is no longer
-  needed.
-* Thu Feb 10 2005 - [email protected]
-- Added gok-09-toggle-button.diff to enable gok search
-  the children of ROLE_TOGGLE_BUTTON objects. Fixes bug #6223576.
-* Thu Jan 27 2005 - [email protected]
-- Finish build error fix: Source8 -> Source 2.
-* Thu Jan 27 2005 - [email protected]
-- Fixed the build error from l10n tarball
-* Wed Jan 26 2005 - [email protected]
-- Update docs with Linux specific tarball from [email protected].
-* Wed Jan 19 2005 - [email protected]
-- Revved to 0.12.1; fixes for bugs including 5109895.
-- Removed patch5, as it is in the new tarball.
-* Fri Jan 14 2005 - [email protected]
-- Updated l10n help tarball for cinnabar-linux
-* Mon Jan 10 2005 - [email protected]
-- Fix 6196403 - add gok-08-help-figs.diff to install 'figures' directory.
-* Fri Jan 07 2005 - [email protected]
-- Added %ifos solaris version of patch1, to add exec prefix to Mozilla.
-- Fixes bug 6211656.
-* Mon Dec 13 2004 - [email protected]
-- Removed unwanted scrollkeeper and gtk-doc files.  Thanks Damien.
-* Tue Dec 07 2004 - [email protected]
-- Revved to 0.11.17.  
-- Removed gok-03-toolbarfix.diff, as it is in the new tarball. 
-- Includes fix for 6200712.
-* Fri Nov 19 2004 - [email protected]
-- add --bindir=%{_bindir} and --libdir=%{_libdir} to configure opts.
-* Fri Nov 12 2004 - [email protected]
-- Added workaround fix for 6193354
-* Fri Nov 05 2004 - [email protected]
-- Revved to 0.11.16.  Fixes for 6185980, 6177484, 5087990, 6185984.
-* Fri Nov 05 2004 - [email protected]
-- Added intltoolize to get the latest intltool-update/merge
-- Added gok-06-g11n-i18n-ui.diff to fix 6173646
-* Thu Oct 28 2004 - [email protected]
-- Add create-branching-keyboard.1, gok.1 man pages
-* Wed Oct 27 2004 - [email protected]
-- Revved to gok-0.11.14.  Removed patches 3 and 4 (integrated).
-  Contains fixes for bugs 5108516, 6179076, 5087916, 
-  bugzilla bugs 154604, 154499, 156479, 156153, 155344, 155512.
-* Tue Oct 26 2004 - [email protected]
-- Integrate updated docs tarball from [email protected].
-* Wed Oct 13 2004 - [email protected]
-- Added patch gok-05-fix-strings.diff for bugzilla 155229.
-* Wed Oct 13 2004 - [email protected]
-- Added m4 in %prep to pre-generate .schemas.in
-* Tue Oct 12 2004 - [email protected]
-- Added patch gok-04-actionfix.diff for P1 6176892.
-  Should be removed when we rev to gok-0.11.11 or higher.
-* Wed Oct 08 2004 - [email protected]
-- Added buildfix patch gok-03-buildfix.diff (forte build failed).
-* Wed Oct 06 2004 - [email protected]
-- Revved to 0.11.10, to fix P1 6174262.
-* Fri Oct 01 2004 - [email protected]
-- Revved to 0.11.9
-* Fri Sep 24 2004 - [email protected]
-- Added gok-02-g11n-potfiles.diff
-* Wed Sep 16 2004 - [email protected]
-- added missing dependencies
-* Wed Sep 15 2004 - [email protected]
-- Integrate updated docs tarball from [email protected].
-* Thu Sep 02 2004 - [email protected]
-- Add docs tarball from [email protected].
-* Wed Sep 01 2004 - [email protected]
-- Revved to 0.11.7.
-* Wed Aug 25 2004 - [email protected]
-- Add create-branching-keyboard to %files.
-* Tue Aug 24 2004 - [email protected]
-- Removed "launcher.kbd" part of gok-01-jds-apps.diff, we only need to patch
-- the .kbd.in file and re-make.
-* Thu Aug 17 2004 - [email protected]
-- Added patch gok-01-jds-apps.diff, for bug #5085248.  This is a JDS-specific 
-- branding patch, which needed to be applied now due to string freeze impact.
-* Mon Aug 16 2004 - [email protected]
-- Bumped to 0.11.6.
-* Thu Aug 12 2004 - [email protected]
-- Removed the gok g11n patches, they should have been applied to cvs instead.
-- They were also incorrect; root cause of problem appears to be an intltool bug
-- Bumped version to 0.11.5.
-* Wed Jul 15 2004 - [email protected]
-- Added gok-01-g11n-potfiles.diff and gok-02-g11n-i18n-ui.diff. Fixes bug
-  #5074183
-* Thu Jul 08 2004 - [email protected]
-- Updated l10n content to gok-l10n-po-1.2.tar.bz2
-* Wed Jul 07 2004 - [email protected]
-- added "-j $CPUS" to make to speed up builds
-* Wed Jun 23 2004 - [email protected]
-- Install gconf schema files. Fixes bug #5045140
-* Fri Jun 11 2004 - [email protected]
-- fix 0.11.4.1 tarball and Source tag
-* Thu Jun 10 2004 - <[email protected]>
-- Bump to 0.11.4.1
-* Thu Jun 10 2004 - <[email protected]>
-- Bump to 0.11.4
-* Fri May 14 2004 - <[email protected]>
-- Bump to 0.11.2
-* Wed May 12 2004 - [email protected]
-- Updated l10n content to gok-l10n-po-1.1.tar.bz2
-* Thu Apr 22 2004 - <[email protected]>
-- Bump to 0.10.2
-* Sun Apr 18 2004 - [email protected]
-- enable javahelp conversion on Solaris
-* Thu Apr 01 2004 - [email protected]
-- Javahelp converison
-* Wed Mar 31 2004 - [email protected]
-- replace tar jxf with the more solaris friendly
-  bzcat piped through tar
-* Mon Mar 29 2004 - [email protected]
-- Adding gok-l10n-po-1.0.tar.bz2 l10n content
-* Tue Mar 23 2004 - <[email protected]>
-- Bump to 0.10.0
-* Mon Mar 15 2004 - <[email protected]>
-- Remove gtk-doc line from %files section as no files there any more.
-* Thu Mar 11 2004 - <[email protected]>
-- Reset release to 1.
-* Wed Mar 10 2004 - [email protected]
-- Bump to 0.9.10
-* Mon Feb 23 2004 - [email protected]
-- Created new spec file for gok

--- a/copyright/SUNWgnome-a11y-gok.copyright	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-Copyright (c) 2008, 2010, Oracle and/or its affiliates.  All rights reserved.
-
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-Licensing and copyright information for %{name}:
-
- License: GNU LIBRARY GENERAL PUBLIC LICENSE
- 
- You can find more information in the following directory:
- %{_pkg_docdir}
-
-  COPYING.bz2: GNU LGPL
-  AUTHORS: list of authors of gok
-  NEWS.bz2: list of the most important changes in gok
-  ChangeLog.bz2: list of all changes and authors of gok 
-  README: more information about gok
-
- The sources of gok-%{gok.version} were downloaded
- from %{gok.SOURCE0.url}
-

--- a/manpages/Makefile	Tue Mar 29 04:17:22 2011 +0000
+++ b/manpages/Makefile	Tue Mar 29 09:22:44 2011 +0000
@@ -93,7 +93,6 @@
 	SUNWgftp			\
 	SUNWglibmm			\
 	SUNWgnome-a11y-dasher		\
-	SUNWgnome-a11y-gok		\
 	SUNWgnome-a11y-libs		\
 	SUNWgnome-a11y-mousetweaks	\
 	SUNWgnome-a11y-poke		\
@@ -382,11 +381,6 @@
 	man1/dasher.1
 SUNWgnome-a11y-dasher.PAGES: $(SUNWgnome-a11y-dasher_PAGES)
 
-SUNWgnome-a11y-gok_PAGES =			\
-	man1/create-branching-keyboard.1	\
-	man1/gok.1
-SUNWgnome-a11y-gok.PAGES: $(SUNWgnome-a11y-gok_PAGES)
-
 SUNWgnome-a11y-libs_PAGES =		\
 	man1/magnifier.1		\
 	man1/at-spi-registryd.1		\

--- a/manpages/man1/gok.1	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,264 +0,0 @@
-<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
-<!--ArborText, Inc., 1988-1999, v.4002-->
-<!--ARC : LSARC 2002/292 GOK On-Screen Reader/Magnifier for the GNOME desktop-->
-<!ENTITY cmd "gok">
-<!ENTITY % commonents SYSTEM "smancommon.ent">
-%commonents;
-<!ENTITY % booktitles SYSTEM "booktitles.ent">
-%booktitles;
-<!ENTITY suncopy "Copyright (c) 2004,2006,2007 Sun Microsystems, Inc. All Rights Reserved.">
-]>
-<?Pub UDT _bookmark _target>
-<?Pub EntList brvbar bull cross dash diam diams frac12 frac13 frac14 hellip
- laquo lArr loz mdash nabla ndash para pound rArr raquo sect yen lt gt>
-<?Pub Inc>
-<refentry id="gok-1">
-<!-- %Z%%M% %I% %E% SMI; -->
-<refmeta><refentrytitle>gok</refentrytitle><manvolnum>1</manvolnum>
-<refmiscinfo class="date">12 Nov 2007</refmiscinfo>
-<refmiscinfo class="sectdesc">&man1;</refmiscinfo>
-<refmiscinfo class="software">&release;</refmiscinfo>
-<refmiscinfo class="arch">generic</refmiscinfo>
-<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
-</refmeta>
-<indexterm><primary>gok</primary></indexterm><indexterm><primary>an on-screen
-keyboard written for GNOME</primary></indexterm>
-<refnamediv id="gok-1-name"><refname>gok</refname><refpurpose>GNOME on-screen
-keyboard</refpurpose></refnamediv>
-<refsynopsisdiv id="gok-1-synp"><title>&synp-tt;</title>
-<cmdsynopsis><command>&cmd;</command>
-<arg choice="opt"><option>-access-method=<replaceable>name</replaceable></option></arg>
-<arg choice="opt"><option>-editor</option></arg>
-<arg choice="opt"><option>-extras</option></arg>
-<arg choice="opt"><option>-geometry=<replaceable>geometry</replaceable></option></arg>
-<arg choice="opt"><option>-help</option></arg>
-<arg choice="opt"><option>-input-device=<replaceable>device</replaceable></option></arg>
-<arg choice="opt"><option>-keyboard=<replaceable>keyboard</replaceable></option></arg>
-<arg choice="opt"><option>-list-accessmethods</option></arg>
-<arg choice="opt"><option>-list-actions</option></arg>
-<arg choice="opt"><option>-login</option></arg>
-<arg choice="opt"><option>-remembergeometry</option></arg>
-<arg choice="opt"><option>-scan-action=<replaceable>string</replaceable></option></arg>
-<arg choice="opt"><option>-select-action=<replaceable>string</replaceable></option></arg>
-<arg choice="opt"><option>-settings</option></arg>
-<arg choice="opt"><option>-usage</option></arg>
-<arg choice="opt"><option>-valuator-sensitivity=<replaceable>double</replaceable></option></arg>
-<arg choice="opt"><option role="nodash"><replaceable>gnome-std-options</replaceable></option></arg>
-</cmdsynopsis></refsynopsisdiv>
-<refsect1 id="gok-1-desc"><title>&desc-tt;</title>
-<para>The GNOME On-screen Keyboard (GOK) is a dynamic on-screen keyboard for
-UNIX and UNIX-like operating systems. <command>&cmd;</command> enables users
-to control their computer without having to rely on a standard keyboard or
-mouse. Many individuals must control the computer using alternative input
-methods. With the right hardware support and <command>&cmd;</command>, individuals
-have full access to applications that support the AT SPI, and therefore, full
-access to the functionality that these applications provide.</para>
-</refsect1>
-<refsect1 id="gok-1-opts"><title>&opts-tt;</title>
-<para>The following options are supported:</para>
-<variablelist termlength="wide">
-<varlistentry><term><option>a</option>, <option>-access-method=<replaceable>name</replaceable></option></term>
-<listitem><para>Use the specified access method. <replaceable>name</replaceable>
-is a string and can be found in the various access method files (<filename>
-.xam</filename>) assigned to the "name" property of the <literal>&lt;gok:accessmethod>
-</literal> tag. Note that this is not necessarily the same as the name of
-the <filename>.xam</filename> file, see <option>-list-accessmethods
-</option>.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>e</option>, <option>-editor</option></term><listitem><para>Start the
-GOK keyboard editor.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-extras</option></term><listitem><para>Use special,
-but possibly unstable, <command>&cmd;</command> functionality.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-geometry=<replaceable>geometry</replaceable></option></term>
-<listitem><para>If <option>-geometry</option> is not specified, <command>&cmd;</command>
-remembers its position between invocations and starts in the same position
-as when last shut down.</para>
-<para>If <option>-geometry</option> is specified, <command>&cmd;</command>
-positions itself within the rectangular area of screen described by the given
-X11 geometry specification, but does not remember its position when shut down.
-This behavior can be changed with the <option>-remembergeometry</option>
-option, which forces <command>&cmd;</command> to remember its position when
-shut down, even when started with <option>-geometry</option>.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-help</option></term><listitem><para>Displays
-the command line options.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>i</option>, <option>-input-device=<replaceable>device</replaceable></option></term>
-<listitem><para>Use the specified input device.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>k</option>, <option>-keyboard=<replaceable>keyboard</replaceable></option></term>
-<listitem><para>Start GOK with the specified keyboard.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-list-accessmethods</option></term><listitem>
-<para>List the access methods that can used as options to other arguments.
-</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-list-actions</option></term><listitem><para>
-List the actions that can used as options to other arguments.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>l</option>, <option>-login</option></term><listitem><para>Specify
-that GOK is used to log in.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-remembergeometry</option></term><listitem><para>
-Can be used with the <option>-geometry</option> option. Forces GOK to remember
-its position when shut down, even if started with the <option>-geometry</option>
-option. See <option>-geometry</option>.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-scan-action=<replaceable>string</replaceable></option></term>
-<listitem><para>Start GOK and hook this action to scan operations. See <option>
--list-actions</option>.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-select-action=<replaceable>string</replaceable></option></term>
-<listitem><para>Start GOK and hook this action to select operations. See <option>
--list-actions</option>.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>s</option>, <option>-settings</option></term><listitem><para>Open
-the settings dialog box when GOK starts.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-usage</option></term><listitem><para>Displays
-a brief usage message.</para>
-</listitem></varlistentry>
-<varlistentry><term><option><option>-valuator-sensitivity=<replaceable>double
-</replaceable></option></option></term><listitem><para>A multiplier to be
-applied to input device valuator events before processing.</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option role="nodash"><replaceable>gnome-std-options</replaceable></option></term>
-<listitem><para>
-Standard options available for use with most GNOME applications.  See
-<citerefentry><refentrytitle>gnome-std-options</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-for more information.
-</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="gok-1-exde"><title>&exde-tt;</title>
-<para>GOK features Direct Selection, Dwell Selection, Automatic Scanning and
-Inverse Scanning access methods, and includes word completion.</para>
-<para>GOK includes an alphanumeric keyboard and a keyboard for launching applications.
-Keyboards are specified in XML, enabling existing keyboards to be modified
-and new keyboards to be created. The access methods are also specified in
-XML, providing the ability to modify existing access methods and create new
-ones. GOK is not limited to presenting keyboards that have been designed by
-hand, and can dynamically create keyboards to adapt to the user's current
-situation.</para>
-<para>GOK can redisplay components of the user interfaces of running applications
-directly within GOK as keyboards. This provides efficient access to elements
-of the user interface, removing the need to navigate the interface indirectly
-though keyboard accelerators. GOK supports the redisplay of application menus
-and toolbars. GOK contains a window activator keyboard that lists the current
-windows on the desktop and provides the ability to switch between them.</para>
-<para>Users have the option of setting key width, height, and spacing as well
-as visual and auditory feedback on highlighting and selection. GOK can be
-further customized if you have programming skills, and contributions are welcome.
-</para>
-<para>If you build GOK from source, you can find some documentation about
-the internal GOK APIs in the  gok/docs/reference/html directory.</para>
-<para>Note: Although GOK can be operated via the "core pointer" device, that
-is, the system mouse or a device that controls the primary onscreen pointer,
-this mode of operation is not supported or recommended for most users. This
-is because the operating system and primary GUI toolkits reserve the core
-pointer for their own use, resulting in conflicts with GOK that can "lock
-out" a GOK user who cannot activate the keyboard or use the core pointer to
-"point and click" in the usual way. GOK can be operated via "auxiliary" input
-devices, which act as secondary or additional button or pointing devices.
-See the GOK online reference manual and the GNOME Accessibility Guide for
-more information on how to configure GOK to use auxiliary input devices.</para>
-</refsect1>
-<refsect1 id="gok-1-exam"><title>&exam-tt;</title>
-<example role="example">
-<title>Specifying an Access Method to Use for GOK</title>
-<para><screen>example% <userinput>&cmd; <option>-access-method=dwellselection
-</option></userinput></screen></para>
-</example>
-<example role="example">
-<title>Automatically Open the GOK Preferences Dialog When GOK Starts</title>
-<para><screen>example% <userinput>&cmd; <option>-settings</option></userinput></screen></para>
-</example>
-</refsect1>
-<refsect1 id="gok-1-exit"><title>&exit-tt;</title>
-<para>The following exit values are returned:</para>
-<variablelist termlength="xtranarrow">
-<varlistentry><term><returnvalue>0</returnvalue></term><listitem><para>Application
-exited successfully.</para>
-</listitem></varlistentry>
-<varlistentry><term><returnvalue>1</returnvalue></term><listitem><para>Application
-exited with error.</para>
-</listitem></varlistentry>
-<varlistentry><term><returnvalue>2</returnvalue></term><listitem><para>GOK
-cannot be initialized from configuration data.</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="gok-1-file"><title>&file-tt;</title>
-<para>The following files are used by this application:</para>
-<variablelist termlength="wide">
-<varlistentry><term><filename>/usr/bin/&cmd;</filename></term><listitem><para>
-Executable for GNOME on-screen keyboard</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok/*.kbd</filename></term><listitem>
-<para>GOK branching keyboards (C locale)</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok/*.xam</filename></term><listitem>
-<para>Access Method definition files</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok/<replaceable>locale</replaceable>/*.kbd
-</filename></term><listitem><para>Localized GOK branching keyboards</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok/dictionary.txt</filename></term>
-<listitem><para>Primary GOK word-completion dictionary</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok/*.png</filename></term><listitem>
-<para>Image files for GOK branching keyboards</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok/goksound*.wav</filename></term>
-<listitem><para>Example GOK audio feedback</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>/usr/share/gok.rc</filename></term><listitem>
-<para>GtkRC file defining GOK color scheme</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="gok-1-attr"><title>&attr-tt;</title>
-<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
-<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
-for descriptions of the following attributes:</para>
-<informaltable frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
-<colspec colname="COLSPEC1" colwidth="1*">
-<thead>
-<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
-valign="middle">ATTRIBUTE VALUE</entry></row>
-</thead>
-<tbody>
-<row><entry><para>Availability</para></entry><entry><para>gnome/accessibility/gok
-</para></entry></row>
-<row><entry colname="COLSPEC0"><para>Interface stability</para></entry><entry
-colname="COLSPEC1"><para>Volatile</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</refsect1>
-<refsect1 id="gok-1-also"><title>&also-tt;</title>
-<!--Reference to another man page-->
-<!--Reference to a Help manual-->
-<!--Reference to a book.-->
-<para>
-<citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>gnome-std-options</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-</para>
-
-<para>GOK online reference manual.</para>
-<para>Latest version of the <citetitle>GNOME Accessibility Guide</citetitle>
-for your platform.</para>
-<para>Latest version of the <citetitle>GNOME Desktop User Guide</citetitle>
-for your platform.</para>
-<para><citerefentry><refentrytitle>create-branching-keyboard</refentrytitle>
-<manvolnum>1</manvolnum></citerefentry></para>
-</refsect1>
-<refsect1 id="gok-1-note"><title>&note-tt;</title>
-<para>
-Written by Bill Haneman and David Bolter, Sun Microsystems Inc., 2004, 2006,
-2007.
-</para>
-</refsect1>
-</refentry>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-09-remove-gok.diff	Tue Mar 29 09:22:44 2011 +0000
@@ -0,0 +1,17 @@
+diff -urN gnome-control-center-2.30.1-orig/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.30.1/capplets/default-applications/gnome-default-applications.xml.in
+--- gnome-control-center-2.30.1-orig/capplets/default-applications/gnome-default-applications.xml.in	2011-03-29 16:16:08.359816379 +0800
++++ gnome-control-center-2.30.1/capplets/default-applications/gnome-default-applications.xml.in	2011-03-29 16:16:31.982465085 +0800
+@@ -409,13 +409,6 @@
+ 
+   <a11y-mobility>
+     <mobility>
+-      <_name>GNOME OnScreen Keyboard</_name>
+-      <executable>gok</executable>
+-      <command>gok</command>
+-      <icon-name>accessibility-keyboard-capplet</icon-name>
+-      <run-at-start>false</run-at-start>
+-    </mobility>
+-    <mobility>
+       <_name>Dasher</_name>
+       <executable>dasher</executable>
+       <command>dasher</command>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-33-remove-gok.diff	Tue Mar 29 09:22:44 2011 +0000
@@ -0,0 +1,22 @@
+diff -urN gdm-2.30.5-orig/data/greeter-autostart/Makefile.am gdm-2.30.5/data/greeter-autostart/Makefile.am
+--- gdm-2.30.5-orig/data/greeter-autostart/Makefile.am	2011-03-29 16:07:12.488478598 +0800
++++ gdm-2.30.5/data/greeter-autostart/Makefile.am	2011-03-29 16:07:26.409005025 +0800
+@@ -18,7 +18,6 @@
+ 	gnome-mag.desktop.in			\
+ 	gnome-power-manager.desktop.in		\
+ 	gnome-settings-daemon.desktop.in	\
+-	gok.desktop.in				\
+ 	metacity.desktop.in			\
+ 	orca-screen-reader.desktop.in		\
+ 	polkit-gnome-authentication-agent-1.desktop.in	\
+diff -urN gdm-2.30.5-orig/data/greeter-autostart/Makefile.in gdm-2.30.5/data/greeter-autostart/Makefile.in
+--- gdm-2.30.5-orig/data/greeter-autostart/Makefile.in	2011-03-29 16:07:12.488175916 +0800
++++ gdm-2.30.5/data/greeter-autostart/Makefile.in	2011-03-29 16:07:36.676697564 +0800
+@@ -334,7 +334,6 @@
+ 	gnome-mag.desktop.in			\
+ 	gnome-power-manager.desktop.in		\
+ 	gnome-settings-daemon.desktop.in	\
+-	gok.desktop.in				\
+ 	metacity.desktop.in			\
+ 	orca-screen-reader.desktop.in		\
+ 	polkit-gnome-authentication-agent-1.desktop.in	\

--- a/patches/gok-01-linux-apps.diff	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-diff -urN gok-1.0.5/launcher.kbd.in gok-1.0.5-hacked/launcher.kbd.in
---- gok-1.0.5/launcher.kbd.in	2003-11-11 10:17:54.000000000 +1300
-+++ gok-1.0.5-hacked/launcher.kbd.in	2005-09-18 19:38:37.983867928 +1200
-@@ -13,11 +13,23 @@
- 		<_GOK:label>Web Browser</_GOK:label> 
- 		<GOK:output type="exec">mozilla</GOK:output>
- 	</GOK:key> 
-+	<GOK:key left="6" right="9" top="0" bottom="1" type="normal"> 
-+		<_GOK:label>StarOffice</_GOK:label> 
-+		<GOK:output type="exec">/opt/staroffice8/program/soffice</GOK:output>
-+	</GOK:key> 
- 	<GOK:key left="0" right="3" top="1" bottom="2" type="normal"> 
-+		<_GOK:label>Email and Calendar</_GOK:label> 
-+		<GOK:output type="exec">evolution</GOK:output>
-+	</GOK:key> 
-+	<GOK:key left="3" right="5" top="1" bottom="2" type="normal"> 
- 		<_GOK:label>Text Editor</_GOK:label> 
- 		<GOK:output type="exec">gedit</GOK:output>
- 	</GOK:key> 
--	<GOK:key left="3" right="6" top="1" bottom="2" type="normal"> 
-+	<GOK:key left="5" right="7" top="1" bottom="2" type="normal"> 
-+		<_GOK:label>Instant Messaging</_GOK:label> 
-+		<GOK:output type="exec">gaim</GOK:output>
-+	</GOK:key> 
-+	<GOK:key left="7" right="9" top="1" bottom="2" type="normal"> 
- 		<_GOK:label>Help Browser</_GOK:label> 
- 		<GOK:output type="exec">gnome-help</GOK:output>
- 	</GOK:key> 

--- a/patches/gok-01-solaris-apps.diff	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-diff -urN gok-1.0.5/launcher.kbd.in gok-1.0.5-hacked/launcher.kbd.in
---- gok-1.0.5/launcher.kbd.in	2003-11-11 10:17:54.000000000 +1300
-+++ gok-1.0.5-hacked/launcher.kbd.in	2005-09-18 19:39:06.835481816 +1200
-@@ -11,13 +11,25 @@
- 	</GOK:key> 
- 	<GOK:key left="3" right="6" top="0" bottom="1" type="normal"> 
- 		<_GOK:label>Web Browser</_GOK:label> 
--		<GOK:output type="exec">mozilla</GOK:output>
-+		<GOK:output type="exec">firefox</GOK:output>
- 	</GOK:key> 
--	<GOK:key left="0" right="3" top="1" bottom="2" type="normal"> 
-+ 	<GOK:key left="6" right="9" top="0" bottom="1" type="normal"> 
-+ 		<_GOK:label>StarOffice</_GOK:label> 
-+ 		<GOK:output type="exec">soffice</GOK:output>
-+ 	</GOK:key> 
-+  	<GOK:key left="0" right="3" top="1" bottom="2" type="normal"> 
-+ 		<_GOK:label>Email and Calendar</_GOK:label> 
-+ 		<GOK:output type="exec">evolution</GOK:output>
-+ 	</GOK:key> 
-+ 	<GOK:key left="3" right="5" top="1" bottom="2" type="normal"> 
- 		<_GOK:label>Text Editor</_GOK:label> 
- 		<GOK:output type="exec">gedit</GOK:output>
- 	</GOK:key> 
--	<GOK:key left="3" right="6" top="1" bottom="2" type="normal"> 
-+ 	<GOK:key left="5" right="7" top="1" bottom="2" type="normal"> 
-+ 		<_GOK:label>Instant Messaging</_GOK:label> 
-+ 		<GOK:output type="exec">pidgin</GOK:output>
-+ 	</GOK:key> 
-+ 	<GOK:key left="7" right="9" top="1" bottom="2" type="normal"> 
- 		<_GOK:label>Help Browser</_GOK:label> 
- 		<GOK:output type="exec">gnome-help</GOK:output>
- 	</GOK:key> 

--- a/patches/gok-02-langdirs.diff	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gok-2.28.1/configure.in.ori	2009-10-26 14:50:25.946515328 +0000
-+++ gok-2.28.1/configure.in	2009-10-26 15:02:02.372101401 +0000
-@@ -241,7 +241,7 @@
- AC_SUBST(LIBBONOBO_IDL_DIR)
- 
- dnl list of language subdirs (for .gitignore)
--LANGDIRS="`$GREP -v "^\#" po/LINGUAS | while read line; do echo -n "$line/ "; done `"
-+LANGDIRS="`$AWK '/^[^#]/ {print $1"/"}' ORS=' ' po/LINGUAS`"
- AC_SUBST(LANGDIRS)
- 
- AC_SUBST(CFLAGS)

--- a/patches/gok-03-omf.diff	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gok-2.30.0/omf.make-orig	2010-10-05 18:26:30.341217318 -0500
-+++ gok-2.30.0/omf.make	2010-10-05 18:37:42.992060359 -0500
-@@ -36,7 +36,7 @@ omf: omf_timestamp
- 
- omf_timestamp: $(omffile)
- 	-for file in $(omffile); do \
--	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+	  scrollkeeper-preinstall //$(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done; \
- 	touch omf_timestamp
- 

--- a/specs/SUNWgnome-a11y-gok.spec	Tue Mar 29 04:17:22 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,285 +0,0 @@
-#
-# spec file for package SUNWgnome-a11y-gok
-#
-# includes module(s): gok
-#
-# Copyright 2009 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-%define owner liyuan
-#
-%include Solaris.inc
-
-%use gok = gok.spec
-
-Name:                    SUNWgnome-a11y-gok
-License:		 LGPL
-IPS_package_name:        gnome/accessibility/gok
-Meta(info.classification): %{classification_prefix}:Applications/Universal Access
-Summary:                 GNOME On-screen Keyboard
-Version:                 %{gok.version}
-Source:                  %{name}-manpages-0.1.tar.gz
-SUNW_BaseDir:            %{_basedir}
-SUNW_Copyright:          %{name}.copyright
-BuildRoot:               %{_tmppath}/%{name}-%{version}-build
-
-%include default-depend.inc
-%include gnome-consolidation.inc
-Requires: SUNWlibglade
-Requires: SUNWgnome-a11y-libs
-Requires: SUNWgnome-a11y-gok-root
-Requires: SUNWgnome-panel
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-a11y-speech
-Requires: SUNWgnome-audio
-Requires: SUNWgnome-component
-Requires: SUNWgnome-config
-Requires: SUNWlibms
-Requires: SUNWlxml
-Requires: SUNWdesktop-cache
-Requires: SUNWlibcanberra
-BuildRequires: SUNWlibglade-devel
-BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-a11y-speech-devel
-BuildRequires: SUNWgnome-panel-devel
-BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWlibcanberra
-
-%package root
-Summary:                 %{summary} - / filesystem
-SUNW_BaseDir:            /
-%include default-depend.inc
-%include gnome-consolidation.inc
-
-%if %build_l10n
-%package l10n
-IPS_package_name:        gnome/accessibility/gok/l10n
-Summary:                 %{summary} - l10n files
-SUNW_BaseDir(relocate_from:%{_prefix}): %{_gnome_il10n_basedir}
-%include default-depend.inc
-%include gnome-consolidation.inc
-Requires:                %{name}
-%endif
-
-%prep
-rm -rf %name-%version
-mkdir %name-%version
-%gok.prep -d %name-%version
-cd %{_builddir}/%name-%version
-gzcat %SOURCE0 | tar -xf -
-
-%build
-export PKG_CONFIG_PATH=%{_pkg_config_path}
-export LDFLAGS="%_ldflags"
-%ifarch sparc
-export CFLAGS="%optflags -I%{_includedir}"
-%else
-export CFLAGS="%optflags -xO2 -I%{_includedir}"
-%endif
-%if %option_with_fox
-# for <X11/extensions/XInput.h>
-export CFLAGS="$CFLAGS -I/usr/X11/include"
-%endif
-export RPM_OPT_FLAGS="$CFLAGS"
-%gok.build -d %name-%version
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%gok.install -d %name-%version
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-cd %{_builddir}/%name-%version/sun-manpages
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%if %build_l10n
-%else
-# REMOVE l10n FILES
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale
-rm -r $RPM_BUILD_ROOT%{_datadir}/gok/ang
-rm -r $RPM_BUILD_ROOT%{_datadir}/gok/[a-z][a-z]
-rm -r $RPM_BUILD_ROOT%{_datadir}/gok/[a-z][a-z]_[A-Z][A-Z]
-rm -r $RPM_BUILD_ROOT%{_datadir}/gok/ca@valencia
-rm -r $RPM_BUILD_ROOT%{_datadir}/gok/mai
-rm -r $RPM_BUILD_ROOT%{_datadir}/gok/sr@latin
-%endif
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):unsupported" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%restart_fmri desktop-mime-cache icon-cache gconf-cache
-
-%postun
-%restart_fmri desktop-mime-cache
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/bonobo
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/*
-%doc -d gok-%{gok.version} README AUTHORS
-%doc(bzip2) -d gok-%{gok.version} COPYING NEWS ChangeLog
-%dir %attr (0755, root, other) %{_datadir}/doc
-%dir %attr (0755, root, other) %{_datadir}/gnome
-%{_datadir}/gnome/help/gok/C
-%{_datadir}/gok/C/*.kbd
-%{_datadir}/gok/*.png
-%{_datadir}/gok/*.kbd
-%{_datadir}/gok/*.rc
-%{_datadir}/gok/*.txt
-%{_datadir}/gok/*.xam
-%{_datadir}/sounds/freedesktop/stereo/*.wav
-%dir %attr (-, root, other) %{_datadir}/icons
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
-%{_datadir}/icons/hicolor/48x48/apps/gok.png
-%{_datadir}/omf/gok/gok-C.omf
-%dir %attr (0755, root, other) %{_datadir}/pixmaps
-%{_datadir}/pixmaps/*
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/*
-%{_mandir}/*/*
-
-%{_datadir}/gok/gok-settingsdialog.ui
-%{_datadir}/gok/en@shaw/*.kbd
-%{_datadir}/gok/gok-editor.ui
-
-%files root
-%defattr (-, root, sys)
-%dir %attr (0755, root, sys) %{_sysconfdir}
-%{_sysconfdir}/gconf/schemas/gok.schemas
-
-%if %build_l10n
-%files l10n
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, bin) %{_datadir}/gok
-%{_datadir}/gok/[a-z][a-z]
-%{_datadir}/gok/[a-z][a-z]_[A-Z][A-Z]
-%{_datadir}/gok/ang
-%{_datadir}/gok/mai
-%{_datadir}/gok/sr@latin
-%{_datadir}/gok/ca@*
-%defattr (-, root, other)
-%{_datadir}/locale/[a-z][a-z]
-%{_datadir}/locale/[a-z][a-z]_[A-Z][A-Z]
-%{_datadir}/locale/ang
-%{_datadir}/locale/mai
-%{_datadir}/locale/sr@latin
-%{_datadir}/locale/ca@*
-%{_datadir}/locale/en@shaw/LC_MESSAGES/gok.ui.copyright
-%{_datadir}/locale/en@shaw/LC_MESSAGES/gok.mo
-%endif
-
-%changelog
-* Wed Oct 14 2009 - [email protected]
-- Add SUNWlibcanberra to Requires.
-* Tue Sep 15 2009 - [email protected]
-- Add locale ca@valencia.
-* Mon Jun 15 2009 - [email protected]
-- Minor pkg'ing fix.
-* Fri Apr  3 2009 - [email protected]
-- use desktop-cache instead of postrun
-* Tue Mar 24 2009 - [email protected]
-- Add %{_datadir}/gok/C/*.kbd. doo 2552.
-* Tue Mar 17 2009 - [email protected]
-- Add %{_datadir}/mai, %{_datadir}/locale/mai dir in %file l10n.
-* Thu Sep 18 2008 - [email protected]
-- Added %doc to %files for copyright.
-* Mon Sep 01 2008 - [email protected]
-- Change dirs sr@Latn to sr@latin.
-* Mon Mar 31 2008 - [email protected]
-- Add copyright file
-* Thu Jan 10 2008 - [email protected]
-- change owner to liyuan.
-* Thu Jan  3 2008 - [email protected]
-- use gconf-install.script instead of an inline script
-* Mon Nov 05 2007 - [email protected]
-- Use icon-cache.script for %post. Change the inline post script
-  to an include.
-* Fri Oct 12 1007 - [email protected]
-- add /usr/X11/include to CFLAGS when built with FOX
-* Fri Sep 28 2007 - [email protected]
-- delete SUNWxwrtl dep
-* Mon May 28 2007 - [email protected]
-- Add hicolor dir to %files.
-* Tue Jan 30 2007 - [email protected]
-- Remove the 'ang' locale files when not doing l10n build.
-* Tue Jan 23 2007 - [email protected]
-- Add 'ang' locale.
-* Fri Sep 01 2006 - [email protected]
-- New man page tarball
-* Sat Aug 12 2006 - [email protected]
-- delete some unnecessary env variables
-* Fri Jul 14 2006 - [email protected]
-- update %post/%postun/etc scripts to support diskless client setup,
-  part of 6448317
-* Fri Jul 14 2006 - [email protected]
-- Add %{_datadir}/locale to l10n package, byproduct of intltool update.
-* Thu Jun 29 2006 - [email protected]
-- update postrun scripts
-* Mon Jun 26 2006 - [email protected]
-- move back to /usr, part of CR 6412650
-* Sun Jun 11 2006 - [email protected]
-- change group from other to bin/sys
-* Wed May 31 2006 - [email protected]
-- Change dirs in base and l10n packages as l10n files have been moved around
-  for the 1.0.10 tarball.
-* Thu May 25 2006 - [email protected]
-- use post/preun scripts to install schemas into the merged gconf files
-* Tue May 09 2006 - [email protected]
-- merge -share pkg(s) into the base pkg(s)
-* Mon Feb 20 2006 - [email protected]
-- Complete update of Build/Requires after running check-deps.pl script.
-* Thu Feb 16 2006 - [email protected]
-- Update Build/Requires after running check-deps.pl script.
-* Sat Dec  3 2005 - [email protected]
-- add %post script that runs update-desktop-database
-* Tue Nov 29 2005 - [email protected]
-- remove javahelp stuff
-* Mon Dec 13 2004 - [email protected]
-- Move to /usr/sfw to implement ARC decision.
-* Fri Nov 19 2004 - [email protected]
-- Fix for 6197815: move unsupported app to /usr/demo/jds.
-* Fri Nov 12 2004 - [email protected]
-- Added workaround fix for 6193354
-* Wed Oct 06 2004 - [email protected]
-- added l10n help files
-* Sat Oct 02 2004 - [email protected]
-- added %pkgbuild_postprocess
-* Thu Sep 09 2004  [email protected]
-- Added create-branching-keyboard.1, gok.1 manpages
-* Thu Aug 26 2004  [email protected]
-- Lower optimization level on x86 to fix 5086691 - data corruption otherwise.
-  -xO2 will take precedence over -xO4 because it is later in CFLAGS.
-* Sat Jun 26 2004  [email protected]
-- Changed install location to /usr/...
-* Wed Jun 23 2004 - [email protected]
-- Install schema files.
-* Wed Jun  2 2004 - [email protected]
-- Added %{_datadir}/locale to install l10n messages
-* Tue May 18 2004 - [email protected]
-- add gnome-speech dependency
-* Tue Mar 23 2004 - [email protected]
-- remove gtk-doc from %files
-* Tue Mar 02 2004 - [email protected]
-- add dependency on SUNWgnome-panel
-* Fri Feb 27 2004 - [email protected]
-- add %defattr for share subpkg
-* Thu Feb 26 2004 - [email protected]
-- add share %package
-- define PERL5LIB for XML::Parser
-
-
-