Hello community, here is the log from the commit of package x11-tools for openSUSE:Factory checked in at 2020-10-07 14:16:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/x11-tools (Old) and /work/SRC/openSUSE:Factory/.x11-tools.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "x11-tools" Wed Oct 7 14:16:13 2020 rev:45 rq:838419 version:0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/x11-tools/x11-tools.changes 2018-11-12 09:50:11.256395812 +0100 +++ /work/SRC/openSUSE:Factory/.x11-tools.new.4249/x11-tools.changes 2020-10-07 14:16:17.253380762 +0200 @@ -1,0 +2,22 @@ +Mon Sep 28 19:21:21 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- xim script: also consider files below /usr/etc/X11/xim.d (boo#1176431) + +------------------------------------------------------------------- +Thu Sep 24 12:51:44 UTC 2020 - Jan Engelhardt <jeng...@inai.de> + +- Upgrade old RPM constructs. + +------------------------------------------------------------------- +Wed Sep 23 16:28:35 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- i18n.template: moved example for user specific LANG setting + from .profile (bash package) to .i18n skeleton file (boo#1158724) + +------------------------------------------------------------------- +Thu Sep 10 21:15:12 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- moved xim files to /usr/etc; xinit is already prepared for this + (boo#1176431) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-tools.spec ++++++ --- /var/tmp/diff_new_pack.ZYgSJL/_old 2020-10-07 14:16:18.065381408 +0200 +++ /var/tmp/diff_new_pack.ZYgSJL/_new 2020-10-07 14:16:18.069381411 +0200 @@ -1,7 +1,7 @@ # # spec file for package x11-tools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ %endif Name: x11-tools -PreReq: %fillup_prereq +Requires(post): %fillup_prereq Provides: 3ddiag Provides: xf86tools Obsoletes: 3ddiag @@ -41,51 +41,55 @@ Source36: nvidia-post-uninstall Source37: i18n.template BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Some useful tools for the X Window System. - - -Authors: --------- - Stefan Dirsch <sndir...@suse.de> - Ludwig Nussel <lnus...@suse.de> - %prep %build %install -mkdir -p $RPM_BUILD_ROOT/usr/bin/ -install -m 755 $RPM_SOURCE_DIR/xf86debug $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d -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%{_fillupdir}/ -install -c -m 644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT%{_fillupdir}/ -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 -install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \ - $RPM_BUILD_ROOT/usr/lib/nvidia/post-uninstall +mkdir -p %{buildroot}/usr/bin/ +install -m 755 %{_sourcedir}/xf86debug %{buildroot}/usr/bin +%if 0%{?suse_version} >= 1550 +mkdir -p %{buildroot}/%{_distconfdir}/X11/xim.d +install -m 644 %{_sourcedir}/xim %{buildroot}/%{_distconfdir}/X11 +install -m 644 %{_sourcedir}/none %{buildroot}/%{_distconfdir}/X11/xim.d +%else +mkdir -p %{buildroot}/etc/X11/xim.d +install -m 644 %{_sourcedir}/xim %{buildroot}/etc/X11 +install -m 644 %{_sourcedir}/none %{buildroot}/etc/X11/xim.d +%endif +mkdir -p %{buildroot}/etc/skel +install -m 644 %{_sourcedir}/xim.template %{buildroot}/etc/skel/.xim.template +install -m 644 %{S:37} %{buildroot}/etc/skel/.i18n +mkdir -p %{buildroot}/%{_fillupdir}/ +install -c -m 644 %{_sourcedir}/sysconfig.language-%{name} %{buildroot}/%{_fillupdir}/ +mkdir -p %{buildroot}/usr/lib/nvidia +install -m 755 %{_sourcedir}/nvidia-pre-install \ + %{buildroot}/usr/lib/nvidia/pre-install +install -m 755 %{_sourcedir}/nvidia-post-uninstall \ + %{buildroot}/usr/lib/nvidia/post-uninstall %post %{fillup_only -an language} %files -%defattr(-, root, root) -%dir /etc/X11/xim.d %dir /usr/lib/nvidia /usr/bin/xf86debug /usr/lib/nvidia/pre-install /usr/lib/nvidia/post-uninstall +%if 0%{?suse_version} >= 1550 +%{_distconfdir}/X11 +%{_distconfdir}/X11/xim +%dir %{_distconfdir}/X11/xim.d +%{_distconfdir}/X11/xim.d/* +%else /etc/X11/xim +%dir /etc/X11/xim.d /etc/X11/xim.d/* +%endif /etc/skel/.xim.template /etc/skel/.i18n %{_fillupdir}/sysconfig.language-%{name} ++++++ i18n.template ++++++ --- /var/tmp/diff_new_pack.ZYgSJL/_old 2020-10-07 14:16:18.117381450 +0200 +++ /var/tmp/diff_new_pack.ZYgSJL/_new 2020-10-07 14:16:18.121381453 +0200 @@ -2,4 +2,15 @@ # Override system wide input method here # -# export INPUT_METHOD=scim \ No newline at end of file +# export INPUT_METHOD=scim + +# Most applications support several languages for their output. +# To make use of this feature, simply uncomment one of the lines below or +# add your own one (see /usr/share/locale/locale.alias for more codes) +# This overwrites the system default set in /etc/sysconfig/language +# in the variable RC_LANG. +# +#export LANG=de_DE.UTF-8 # uncomment this line for German output +#export LANG=fr_FR.UTF-8 # uncomment this line for French output +#export LANG=es_ES.UTF-8 # uncomment this line for Spanish output + ++++++ xim ++++++ --- /var/tmp/diff_new_pack.ZYgSJL/_old 2020-10-07 14:16:18.197381513 +0200 +++ /var/tmp/diff_new_pack.ZYgSJL/_new 2020-10-07 14:16:18.197381513 +0200 @@ -12,7 +12,7 @@ # the Free Software Foundation. -# usually, /etc/X11/xim is used to start a default input method. +# usually, {/usr,}/etc/X11/xim is used to start a default input method. # If want to change the default, you have the following options: # @@ -27,20 +27,20 @@ # This changes the default only for one user. # # The possible values for the variable INPUT_METHOD are the names -# of the scripts which exist in the directory /etc/X11/xim.d/ -# for example if a script /etc/X11/xim.d/scim exists, +# of the scripts which exist in the directory {/usr,}/etc/X11/xim.d/ +# for example if a script {/usr,}/etc/X11/xim.d/scim exists, # and INPUT_METHOD is set to "scim", this script will be tried first # to start an input method and only if this fails other input methods # will be tried. # # 3) If you don't like the behaviour of any of the available -# scripts in /etc/X11/xim.d, you can write your own script +# scripts in {/usr,}/etc/X11/xim.d, you can write your own script # containing the necessary lines to start your preferred input # method and save it as ~/.xim. If a file ~/.xim exists, only # this file is sourced to start an input method and nothing # else. # Usually you need only a few lines, the systemwide -# file to start an input method, /etc/X11/xim, is only so +# file to start an input method, {/usr,}/etc/X11/xim, is only so # complicated because it tries to find a nice default depending # on the language and the installed input methods. # @@ -54,7 +54,7 @@ # export QT_IM_MODULE=scim # scim -d -echo "/etc/X11/xim: Checking whether an input method should be started." +echo "$0: Checking whether an input method should be started." # # Get variables from the user environment which might influence the start @@ -66,9 +66,13 @@ : ${HOSTNAME:=$(hostname)} # Use ~/.i18n if test -e "$HOME/.i18n"; then - echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.i18n." + echo "$0: 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 + if [ -r /etc/profile.d/lang.sh ]; then + . /etc/profile.d/lang.sh < /dev/null > /dev/null 2>&1 + elif [ -r /usr/etc/profile.d/lang.sh ]; then + . /usr/etc/profile.d/lang.sh < /dev/null > /dev/null 2>&1 + fi for cur in $var; do test -n "${!cur}" && echo export $cur=${!cur} done) @@ -78,7 +82,7 @@ case "$SHELL" in */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." + echo "$0: Checking whether an input method is specified in $HOME/.profile." eval $(export HOSTNAME (echo . "'$HOME/.profile' < /dev/null > /dev/null 2>&1" echo "set +u +e" @@ -90,7 +94,7 @@ ;; */csh|*/tcsh) if test -s "$HOME/.login" ; then - echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.login." + echo "$0: Checking whether an input method is specified in $HOME/.login." eval $(export HOSTNAME (echo onintr - echo source "'$HOME/.login' < /dev/null >& /dev/null" @@ -129,7 +133,7 @@ # The test for $GDM_LANG needs to be changed slightly as soon as other # displaymanager also pass a second argument to Xsession. if test -n "$GDM_LANG" ; then - echo "/etc/X11/xim: use GDM_LANG=$GDM_LANG" + echo "$0: use GDM_LANG=$GDM_LANG" adduserenv INPUT_METHOD else adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD @@ -157,8 +161,18 @@ else echo "Start of $INPUT_METHOD failed." fi + elif [ -r "/usr/etc/X11/xim.d/$INPUT_METHOD" ] ; then + echo "sourcing /usr/etc/X11/xim.d/$INPUT_METHOD" + . /usr/etc/X11/xim.d/$INPUT_METHOD + if [ "$?" = "0" ]; then + echo "Start of $INPUT_METHOD succeeded." + gnome_ibus_workaround $INPUT_METHOD + return 0; + else + echo "Start of $INPUT_METHOD failed." + fi else - echo "/etc/X11/xim.d/$INPUT_METHOD does not exist." + echo "{/usr,}/etc/X11/xim.d/$INPUT_METHOD does not exist." fi else echo "INPUT_METHOD is not set or empty (no user selected input method)." @@ -198,6 +212,27 @@ fi done +for subdir in $subdirlist ; do + if [ -d /usr/etc/X11/xim.d/$subdir ] ; then + echo "Checking for a default input method in /usr/etc/X11/xim.d/$subdir/" + for im in /usr/etc/X11/xim.d/$subdir/* ; do + if [ -r $im ] ; then + echo "sourcing $im ..." + . $im + if [ "$?" = "0" ]; then + echo "$im started sucessfully" + gnome_ibus_workaround $im + return 0 + else + echo "$im failed" + im_failed=1 + fi + fi + done + fi +done + + if [ "$im_failed" = 0 ] ; then echo "There is no default input method for the current locale." else @@ -208,4 +243,9 @@ # the dummy input method "none" to get reasonable default settings # of the relevant environment variables: -. /etc/X11/xim.d/none +if [ -r /etc/X11/xim.d/none ]; then + . /etc/X11/xim.d/none +elif [ -r /usr/etc/X11/xim.d/none ]; then + . /usr/etc/X11/xim.d/none +fi +
