Hello community, here is the log from the commit of package aaa_base checked in at Fri Jan 19 01:15:34 CET 2007. -------- --- aaa_base/aaa_base.changes 2007-01-16 11:01:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-01-19 01:12:25.560254000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 19 01:06:19 CET 2007 - ro@suse.de + +- /etc/profile.d/xdg-environment.{sh,csh} + respect /opt/*/share/applications and /etc/opt/*/xdg + (Fate#301042) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.Y14586/_old 2007-01-19 01:15:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Y14586/_new 2007-01-19 01:15:11.000000000 +0100 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.3 -Release: 4 +Release: 5 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -145,6 +145,10 @@ %defattr(-,root,root) %changelog -n aaa_base +* Fri Jan 19 2007 - ro@suse.de +- /etc/profile.d/xdg-environment.{sh,csh} + respect /opt/*/share/applications and /etc/opt/*/xdg + (Fate#301042) * Tue Jan 16 2007 - meissner@suse.de - enable malloc debug again for factory. * Fri Jan 12 2007 - werner@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/xdg-enviroment.csh new/aaa_base/etc/profile.d/xdg-enviroment.csh --- old/aaa_base/etc/profile.d/xdg-enviroment.csh 2006-04-03 12:06:21.000000000 +0200 +++ new/aaa_base/etc/profile.d/xdg-enviroment.csh 2007-01-19 01:06:06.000000000 +0100 @@ -1,6 +1,22 @@ +set nonomatch if ( ! ${?XDG_DATA_DIRS} ) then - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:/etc/opt/kde3/share/:/opt/kde3/share/:/opt/gnome/share/ + setenv XDG_DATA_DIRS /usr/local/share/ + foreach xdgdir ( /usr/share /etc/opt/*/share /opt/*/share ) + if ( -d $xdgdir ) then + if ( -d $xdgdir/applications ) then + setenv XDG_DATA_DIRS "${XDG_DATA_DIRS}:${xdgdir}" + endif + endif + end + endif if ( ! ${?XDG_CONFIG_DIRS} ) then - setenv XDG_CONFIG_DIRS /usr/local/etc/xdg/:/etc/xdg/:/etc/opt/gnome/xdg/ + setenv XDG_CONFIG_DIRS /usr/local/etc/xdg/ + foreach xdgdir ( /etc/xdg /etc/opt/*/xdg ) + if ( -d $xdgdir ) then + setenv XDG_CONFIG_DIRS "${XDG_CONFIG_DIRS}:${xdgdir}" + endif + end endif +unset nonomatch +unset xdgdir diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/xdg-enviroment.sh new/aaa_base/etc/profile.d/xdg-enviroment.sh --- old/aaa_base/etc/profile.d/xdg-enviroment.sh 2005-02-23 13:54:08.000000000 +0100 +++ new/aaa_base/etc/profile.d/xdg-enviroment.sh 2007-01-19 01:06:06.000000000 +0100 @@ -1,6 +1,16 @@ if test -z "$XDG_DATA_DIRS" ; then - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/etc/opt/kde3/share/:/opt/kde3/share/:/opt/gnome/share/ + XDG_DATA_DIRS=/usr/local/share/ + for xdgdir in /usr/share /etc/opt/*/share /opt/*/share ; do + test -d $xdgdir && test -d $xdgdir/applications && XDG_DATA_DIRS="$XDG_DATA_DIRS:$xdgdir" + done + export XDG_DATA_DIRS + fi if test -z "$XDG_CONFIG_DIRS" ; then - export XDG_CONFIG_DIRS=/usr/local/etc/xdg/:/etc/xdg/:/etc/opt/gnome/xdg/ + export XDG_CONFIG_DIRS=/usr/local/etc/xdg/ + for xdgdir in /etc/xdg /etc/opt/*/xdg ; do + test -d $xdgdir && XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$xdgdir" + done + export XDG_CONFIG_DIRS fi +unset xdgdir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org