Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2016-03-01 11:57:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2015-12-24 12:15:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2016-03-01 11:57:39.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 25 12:38:47 UTC 2016 - [email protected] + +- Let the ~/.i18n values parsed as well if GDM_LANG is set (boo#567324) + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20151221.244f2a3.tar.xz New: ---- aaa_base-13.2+git20160225.36aeb39.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.jP1InJ/_old 2016-03-01 11:57:40.000000000 +0100 +++ /var/tmp/diff_new_pack.jP1InJ/_new 2016-03-01 11:57:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package aaa_base # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -18,7 +18,7 @@ Name: aaa_base -Version: 13.2+git20151221.244f2a3 +Version: 13.2+git20160225.36aeb39 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} ++++++ aaa_base-13.2+git20151221.244f2a3.tar.xz -> aaa_base-13.2+git20160225.36aeb39.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20151221.244f2a3/files/etc/profile.d/lang.csh new/aaa_base-13.2+git20160225.36aeb39/files/etc/profile.d/lang.csh --- old/aaa_base-13.2+git20151221.244f2a3/files/etc/profile.d/lang.csh 2015-05-20 11:18:16.000000000 +0200 +++ new/aaa_base-13.2+git20160225.36aeb39/files/etc/profile.d/lang.csh 2016-02-25 13:37:27.000000000 +0100 @@ -15,32 +15,46 @@ # # Already done by the GDM # -if ( ${?GDM_LANG} ) goto end +if ( ${?GDM_LANG} ) then + set LANG=$GDM_LANG +endif + +unset _save +if ( ${?LANG} ) then + set _save=$LANG +endif # # Get the system and after that the users configuration # if ( -s /etc/sysconfig/language ) then - eval `sed -n \ - -e 's/^RC_\(\(LANG\|LC_[A-Z_]\+\)\)=/set \1=/p' \ - -e 's/^\(ROOT_USES_LANG\)=/set \1=/p' \ - < /etc/sysconfig/language` - if ( "$uid" != 0 ) set ROOT_USES_LANG=yes + if ( ${?LANG} ) then + if ( "$uid" == 0 ) then + eval `sed -rn -e 's/^(ROOT_USES_LANG)=/set \1=/p' < /etc/sysconfig/language` + else + set ROOT_USES_LANG=yes + endif + else + eval `sed -rn \ + -e 's/^RC_((LANG|LC_[A-Z_]+))=/set \1=/p' -e 's/^(ROOT_USES_LANG)=/set \1=/p' \ + < /etc/sysconfig/language` + endif endif if ( -s $HOME/.i18n ) then - eval `sed -n \ - -e 's/^\(\(LANG\|LC_[A-Z_]\+\)\)=/set \1=/p' \ - < $HOME/.i18n` + eval `sed -rn -e 's/^((LANG|LC_[A-Z_]+))=/set \1=/p' < $HOME/.i18n` +endif +if ( ${?_save} ) then + set LANG=$_save + unset _save endif # # Handle all LC and the LANG variable # -foreach lc (LANG LC_CTYPE LC_NUMERIC LC_TIME \ - LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS \ - LC_TELEPHONE LC_MEASUREMENT \ - LC_IDENTIFICATION LC_ALL) +foreach lc (LANG LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE \ + LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES \ + LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME ) eval set val=\${\?$lc} if ( $val == 0 ) continue eval set val=\$$lc @@ -67,6 +81,8 @@ endif eval unset $lc end +unset lc val +unset ROOT_USES_LANG # # Special LC_ALL handling because the LC_ALL @@ -82,7 +98,6 @@ unset LC_ALL endif -unset ROOT_USES_LANG lc val end: # # end of lang.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20151221.244f2a3/files/etc/profile.d/lang.sh new/aaa_base-13.2+git20160225.36aeb39/files/etc/profile.d/lang.sh --- old/aaa_base-13.2+git20151221.244f2a3/files/etc/profile.d/lang.sh 2015-05-20 11:18:16.000000000 +0200 +++ new/aaa_base-13.2+git20160225.36aeb39/files/etc/profile.d/lang.sh 2016-02-25 13:37:27.000000000 +0100 @@ -15,10 +15,10 @@ # # Already done by the GDM # -if test -n "$GDM_LANG"; then - test -s $HOME/.i18n && . $HOME/.i18n - return -fi +test -n "$GDM_LANG" && LANG=$GDM_LANG + +unset _save +test -n "$LANG" && _save="$LANG" # # Get the system and after that the users configuration @@ -27,28 +27,31 @@ while read line ; do case "$line" in \#*|"") - continue - ;; + continue + ;; RC_*) - eval ${line#RC_} - ;; + test -n "$LANG" && continue + eval ${line#RC_} + ;; ROOT_USES_LANG*) - eval $line - test "$UID" != 0 && ROOT_USES_LANG=yes - ;; + test "$UID" = 0 && eval $line || ROOT_USES_LANG=yes + ;; esac done < /etc/sysconfig/language + unset line fi test -s $HOME/.i18n && . $HOME/.i18n +test -n "$_save" && LANG="$_save" +unset _save + # # Handle all LC and the LANG variable # -for lc in LANG LC_CTYPE LC_NUMERIC LC_TIME \ - LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS \ - LC_TELEPHONE LC_MEASUREMENT \ - LC_IDENTIFICATION LC_ALL +for lc in LANG LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE \ + LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES \ + LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do eval val="\$$lc" if test "$ROOT_USES_LANG" = "yes" ; then @@ -77,6 +80,9 @@ fi done +unset lc val +unset ROOT_USES_LANG + # # Special LC_ALL handling because the LC_ALL # overwrites all LC but not the LANG variable @@ -87,6 +93,5 @@ unset LC_ALL fi -unset line ROOT_USES_LANG lc val # # end of lang.sh
