Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2022-09-08 14:20:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Thu Sep 8 14:20:18 2022 rev:491 rq:1001371 version:84.87+git20220822.6b9f7a3 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2022-08-12 16:06:14.935398778 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.2083/aaa_base.changes 2022-09-08 14:20:19.698176238 +0200 @@ -1,0 +2,6 @@ +Tue Sep 06 07:10:57 UTC 2022 - lnus...@suse.de + +- Update to version 84.87+git20220822.6b9f7a3: + * Simplify XDG_CONFIG_DIRS (boo#1201802) + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20220727.43b9e53.tar New: ---- aaa_base-84.87+git20220822.6b9f7a3.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.GZwAEr/_old 2022-09-08 14:20:20.578178606 +0200 +++ /var/tmp/diff_new_pack.GZwAEr/_new 2022-09-08 14:20:20.582178617 +0200 @@ -33,7 +33,7 @@ %endif Name: aaa_base -Version: 84.87+git20220727.43b9e53%{git_version} +Version: 84.87+git20220822.6b9f7a3%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -190,6 +190,8 @@ /usr/etc/profile.d/ls.tcsh /usr/etc/profile.d/ls.bash /usr/etc/profile.d/ls.zsh +%dir /usr/lib/environment.d +/usr/lib/environment.d/50-xdg.conf %config /etc/shells %ghost %dir /etc/init.d %ghost %config(noreplace) /etc/init.d/boot.local ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.GZwAEr/_old 2022-09-08 14:20:20.634178757 +0200 +++ /var/tmp/diff_new_pack.GZwAEr/_new 2022-09-08 14:20:20.634178757 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">482cb602376b7010477dba64337c7eb196356740</param></service><service name="tar_scm"> + <param name="changesrevision">166d5ae84c4d401a4432883e6eec6d00a9c1b369</param></service><service name="tar_scm"> <param name="url">https://github.com/lnussel/aaa_base.git</param> <param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata> (No newline at EOF) ++++++ aaa_base-84.87+git20220727.43b9e53.tar -> aaa_base-84.87+git20220822.6b9f7a3.tar ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20220727.43b9e53/aaa_base.spec new/aaa_base-84.87+git20220822.6b9f7a3/aaa_base.spec --- old/aaa_base-84.87+git20220727.43b9e53/aaa_base.spec 2022-07-27 08:18:40.000000000 +0200 +++ new/aaa_base-84.87+git20220822.6b9f7a3/aaa_base.spec 2022-08-22 10:18:14.000000000 +0200 @@ -190,6 +190,8 @@ /usr/etc/profile.d/ls.tcsh /usr/etc/profile.d/ls.bash /usr/etc/profile.d/ls.zsh +%dir /usr/lib/environment.d +/usr/lib/environment.d/50-xdg.conf %config /etc/shells %ghost %dir /etc/init.d %ghost %config(noreplace) /etc/init.d/boot.local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20220727.43b9e53/files/usr/etc/profile.d/xdg-environment.csh new/aaa_base-84.87+git20220822.6b9f7a3/files/usr/etc/profile.d/xdg-environment.csh --- old/aaa_base-84.87+git20220727.43b9e53/files/usr/etc/profile.d/xdg-environment.csh 2022-07-27 08:18:40.000000000 +0200 +++ new/aaa_base-84.87+git20220822.6b9f7a3/files/usr/etc/profile.d/xdg-environment.csh 2022-08-22 10:18:14.000000000 +0200 @@ -1,35 +1,2 @@ -if ( ! ${?XDG_DATA_DIRS} ) then - set XDG_DATA_DIRS -else - set XDG_DATA_DIRS=(${XDG_DATA_DIRS:as/:/ /}) -endif -set nonomatch -foreach xdgdir (/usr/local/share /usr/share /etc/opt/gnome/share /etc/opt/kde4/share /etc/opt/kde3/share /opt/gnome/share /opt/kde4/share /opt/kde3/share /usr/share/gnome) - if ( -d "$xdgdir" && -d "$xdgdir/applications" ) then - set -l XDG_DATA_DIRS=($XDG_DATA_DIRS $xdgdir) - endif -end -unset nonomatch - -set xdgdir="${XDG_DATA_DIRS:q}" -unset XDG_DATA_DIRS -setenv XDG_DATA_DIRS "${xdgdir:as/ /:/}" -unset xdgdir - -if ( ! ${?XDG_CONFIG_DIRS} ) then - set XDG_CONFIG_DIRS -else - set XDG_CONFIG_DIRS=(${XDG_CONFIG_DIRS:as/:/ /}) -endif -set nonomatch -foreach xdgdir (/usr/local/etc/xdg /etc/xdg /usr/etc/xdg /etc/opt/gnome/xdg /etc/opt/kde4/xdg /etc/opt/kde3/xdg) - if ( -d "$xdgdir" ) then - set -l XDG_CONFIG_DIRS=($XDG_CONFIG_DIRS $xdgdir) - endif -end -unset nonomatch - -set xdgdir="${XDG_CONFIG_DIRS:q}" -unset XDG_CONFIG_DIRS -setenv XDG_CONFIG_DIRS "${xdgdir:as/ /:/}" -unset xdgdir +# keep in sync with /usr/lib/environment.d/50-xdg.conf +setenv XDG_CONFIG_DIRS "/etc/xdg:/usr/local/etc/xdg:/usr/etc/xdg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20220727.43b9e53/files/usr/etc/profile.d/xdg-environment.sh new/aaa_base-84.87+git20220822.6b9f7a3/files/usr/etc/profile.d/xdg-environment.sh --- old/aaa_base-84.87+git20220727.43b9e53/files/usr/etc/profile.d/xdg-environment.sh 2022-07-27 08:18:40.000000000 +0200 +++ new/aaa_base-84.87+git20220822.6b9f7a3/files/usr/etc/profile.d/xdg-environment.sh 2022-08-22 10:18:14.000000000 +0200 @@ -1,57 +1,3 @@ -# uniquefy_search_path (search_path): -# -# Remove duplicate entries from a search path string, preserving order. -uniquefy_search_path () -{ - OIFS="$IFS" - IFS=' -' - set -- $(echo ${1+"$@"} | sed -r 's@/*:|([^\\]):@\1\n@g;H;x;s@/\n@\n@') - IFS="$OIFS" - - _y="" - for _x ; do - case ":${_y}:" in - *:"${_x}":*) continue - esac - _y=${_y:+"$_y:"}${_x} - done - - echo "${_y}" - unset _y _x -} - -setup_xdg_paths() { - if [ "x$ZSH_VERSION" != "x" ] ; then - setopt nullglob localoptions - fi - for xdgdir in /usr/local/share /usr/share /etc/opt/gnome/share /etc/opt/kde4/share /etc/opt/kde3/share /opt/gnome/share /opt/kde4/share /opt/kde3/share /usr/share/gnome ; do - if test -d "$xdgdir" && test -d "$xdgdir/applications"; then - if test -z "$XDG_DATA_DIRS"; then - XDG_DATA_DIRS="$xdgdir" - else - XDG_DATA_DIRS="$XDG_DATA_DIRS:$xdgdir" - fi - fi - done - - XDG_DATA_DIRS=$(uniquefy_search_path "$XDG_DATA_DIRS") - export XDG_DATA_DIRS - - for xdgdir in /usr/local/etc/xdg /etc/xdg /usr/etc/xdg /etc/opt/gnome/xdg /etc/opt/kde4/xdg /etc/opt/kde3/xdg ; do - if test -d "$xdgdir"; then - if test -z "$XDG_CONFIG_DIRS"; then - XDG_CONFIG_DIRS="$xdgdir" - else - XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$xdgdir" - fi - fi - done - - XDG_CONFIG_DIRS=$(uniquefy_search_path "$XDG_CONFIG_DIRS") - export XDG_CONFIG_DIRS - - unset xdgdir -} - -setup_xdg_paths +# keep in sync with /usr/lib/environment.d/50-xdg.conf +XDG_CONFIG_DIRS='/etc/xdg:/usr/local/etc/xdg:/usr/etc/xdg' +export XDG_CONFIG_DIRS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20220727.43b9e53/files/usr/lib/environment.d/50-xdg.conf new/aaa_base-84.87+git20220822.6b9f7a3/files/usr/lib/environment.d/50-xdg.conf --- old/aaa_base-84.87+git20220727.43b9e53/files/usr/lib/environment.d/50-xdg.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base-84.87+git20220822.6b9f7a3/files/usr/lib/environment.d/50-xdg.conf 2022-08-22 10:18:14.000000000 +0200 @@ -0,0 +1,8 @@ +# XDG directories, see +# https://specifications.freedesktop.org/basedir-spec/latest/ar01s03.html +# +# According to spec this would only read /etc when unset +XDG_CONFIG_DIRS=/etc/xdg:/usr/local/etc/xdg:/usr/etc/xdg +# +# This is actually the implicit default, no need to set +# XDG_DATA_DIRS=/usr/local/share/:/usr/share/