From 8acfeb59a42ddfe7a236d8810254217bab432a074c38f590562364c631536946 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Fri, 3 Jul 2015 20:25:57 +0000
Subject: [PATCH 1/2] - Add a template for ~/.i18n (bsc#934720).

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=31
---
 i18n.template     | 5 +++++
 x11-tools.changes | 5 +++++
 x11-tools.spec    | 5 ++++-
 xim.template      | 7 ++++---
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 i18n.template

diff --git a/i18n.template b/i18n.template
new file mode 100644
index 0000000..038edfb
--- /dev/null
+++ b/i18n.template
@@ -0,0 +1,5 @@
+# 
+# Override system wide input method here
+#
+
+# export INPUT_METHOD=scim
\ No newline at end of file
diff --git a/x11-tools.changes b/x11-tools.changes
index 6fc8fb7..eeae36c 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul  3 20:24:13 UTC 2015 - eich@suse.com
+
+- Add a template for ~/.i18n (bsc#934720).
+
 -------------------------------------------------------------------
 Wed Jun 24 07:22:49 UTC 2015 - werner@suse.de
 
diff --git a/x11-tools.spec b/x11-tools.spec
index 937a340..d8046f3 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package x11-tools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@ Source33:       none
 Source34:       sysconfig.language-%{name}
 Source35:       nvidia-pre-install
 Source36:       nvidia-post-uninstall
+Source37:       i18n.template
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -59,6 +60,7 @@ install -m 644 $RPM_SOURCE_DIR/xim  $RPM_BUILD_ROOT/etc/X11
 install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/etc/X11/xim.d
 mkdir -p $RPM_BUILD_ROOT/etc/skel
 install -m 644 $RPM_SOURCE_DIR/xim.template $RPM_BUILD_ROOT/etc/skel/.xim.template
+install -m 644 ${S:37} $RPM_BUILD_ROOT/etc/skel/.i18n
 mkdir -p  $RPM_BUILD_ROOT/var/adm/fillup-templates/
 install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/
 mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia
@@ -80,6 +82,7 @@ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
 /etc/X11/xim
 /etc/X11/xim.d/*
 /etc/skel/.xim.template
+/etc/skel/.i18n
 /var/adm/fillup-templates/sysconfig.language-%{name}
 
 %changelog
diff --git a/xim.template b/xim.template
index 339eaeb..135e984 100644
--- a/xim.template
+++ b/xim.template
@@ -3,6 +3,7 @@
 # Copyright © 2001 SUSE LINUX GmbH Nuernberg, Germany
 #
 # Mike Fabian <mfabian@suse.de>, 2005
+# Egbert Eich <eich@suse.com>, 2015
 
 # usually, /etc/X11/xim is used to start a default input method.
 
@@ -12,8 +13,9 @@
 #       For example:
 #           INPUT_METHOD="scim"
 #       This changes the default for all users
-#    2) set and export the variable "INPUT_METHOD" in ~/.profile in the
-#       home directory of a user (or ~/.login for csh users) For example:
+#    2) set and export the variable "INPUT_METHOD" in ~/.i18n in the
+#       home directory of a user.
+#       For example:
 #           export INPUT_METHOD="scim"
 #       This changes the default only for one user.
 #    
@@ -44,4 +46,3 @@
 #       export QT_IM_SWITCHER=imsw-multi
 #       export QT_IM_MODULE=scim
 #       scim -d 
-

From c83df934a8fbfd8779bc1bdf014271ed6800ad0b4fa3d8f08389aa72186ed653 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Fri, 3 Jul 2015 20:36:02 +0000
Subject: [PATCH 2/2] - Fix typo

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=32
---
 x11-tools.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-tools.spec b/x11-tools.spec
index d8046f3..ce00cdb 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -60,9 +60,9 @@ install -m 644 $RPM_SOURCE_DIR/xim  $RPM_BUILD_ROOT/etc/X11
 install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/etc/X11/xim.d
 mkdir -p $RPM_BUILD_ROOT/etc/skel
 install -m 644 $RPM_SOURCE_DIR/xim.template $RPM_BUILD_ROOT/etc/skel/.xim.template
-install -m 644 ${S:37} $RPM_BUILD_ROOT/etc/skel/.i18n
+install -m 644 %{S:37} $RPM_BUILD_ROOT/etc/skel/.i18n
 mkdir -p  $RPM_BUILD_ROOT/var/adm/fillup-templates/
-install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/
+install -c -m 644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/
 mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia
 install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \
   $RPM_BUILD_ROOT/usr/lib/nvidia/pre-install