Hello community, here is the log from the commit of package x11-tools for openSUSE:Factory checked in at 2015-07-02 22:45:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x11-tools (Old) and /work/SRC/openSUSE:Factory/.x11-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "x11-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/x11-tools/x11-tools.changes 2014-11-14 09:18:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.x11-tools.new/x11-tools.changes 2015-07-02 22:45:45.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Jun 24 07:22:49 UTC 2015 - [email protected] + +- Xim script: Allow to simply touch an empty ~/.i18n to override + ~/.profile or ~/.login. Also make sure that all bourne shells + are able to export the variables like INPUT_METHOD. + +------------------------------------------------------------------- +Tue Jun 23 12:40:55 UTC 2015 - [email protected] + +- Xim script: Allow background processes in ~/.profile and ~/.login + (bsc#934720) also use ~/.i18n of exist instead of ~/.profile or + ~/.login + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-tools.spec ++++++ --- /var/tmp/diff_new_pack.75Ymwt/_old 2015-07-02 22:45:46.000000000 +0200 +++ /var/tmp/diff_new_pack.75Ymwt/_new 2015-07-02 22:45:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package x11-tools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ xim ++++++ --- /var/tmp/diff_new_pack.75Ymwt/_old 2015-07-02 22:45:46.000000000 +0200 +++ /var/tmp/diff_new_pack.75Ymwt/_new 2015-07-02 22:45:46.000000000 +0200 @@ -20,8 +20,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. # @@ -63,26 +64,41 @@ adduserenv () { local cur var=${1+"$@"} : ${HOSTNAME:=$(hostname -f)} + # Use ~/.i18n + if test -e "$HOME/.i18n"; then + echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.i18n." + eval $(set +u +e + . /etc/profile.d/lang.sh < /dev/null > /dev/null 2>&1 + for cur in $var; do + echo export $cur=${!cur} + done) + return + fi + # Fall back to ~/.profile or ~/.login case "$SHELL" in - */sh|*/ash|*/bash|*/ksh|*/pdksh|*/zsh) + */sh|*/ash|*/bash|*/ksh|*/mksh|*/pdksh|*/zsh) if test -s "$HOME/.profile" ; then + echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.profile." eval $(export HOSTNAME - (echo . "'$HOME/.profile'" + (echo . "'$HOME/.profile' < /dev/null > /dev/null 2>&1" echo "set +u +e" for cur in $var; do - echo echo \${$cur+"export $cur=\$$cur;"} - done) | $SHELL) + echo echo \${$cur+"$cur=\$$cur;"} + done + echo echo export $var) | $SHELL) fi ;; */csh|*/tcsh) if test -s "$HOME/.login" ; then + echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.login." eval $(export HOSTNAME (echo onintr - - echo source "'$HOME/.login'" + echo source "'$HOME/.login' < /dev/null >& /dev/null" echo unset verbose for cur in $var; do - echo if \( \${?$cur} \) echo export $cur=\`printenv $cur\` - done) | $SHELL) + echo if \( \${?$cur} \) echo $cur=\`printenv $cur\` + done + echo echo export $var) | $SHELL) fi ;; esac @@ -119,11 +135,10 @@ adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD fi -# if INPUT_METHOD is already set to something non-empty here, -# the user must have set it in ~/.profile or ~/.login or on the -# command line before using startx. In that case, don't -# read the system wide default from /etc/sysconfig/language, -# use the user supplied value instead: +# if INPUT_METHOD is already set to something non-empty here, the user should +# set it in ~/.i18n or in ~/.profile or ~/.login or on the command line before +# using startx. In that case, don't read the system wide default from +# /etc/sysconfig/language, use the user supplied value instead: if [ -z "$INPUT_METHOD" ] ; then echo "sourcing /etc/sysconfig/language to get the value of INPUT_METHOD" . /etc/sysconfig/language
