Hello community, here is the log from the commit of package xinit for openSUSE:12.2 checked in at 2012-07-02 21:41:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/xinit (Old) and /work/SRC/openSUSE:12.2/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/xinit/xinit.changes 2012-06-25 16:17:42.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.xinit.new/xinit.changes 2012-07-02 21:41:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 2 09:34:48 UTC 2012 - [email protected] + +- Allow xinitrc scripts to be sourced (bnc#750980) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.spec ++++++ --- /var/tmp/diff_new_pack.DJG13W/_old 2012-07-02 21:41:25.000000000 +0200 +++ /var/tmp/diff_new_pack.DJG13W/_new 2012-07-02 21:41:25.000000000 +0200 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xinit Version: 1.3.2 -Release: 1 -License: MIT +Release: 0 Summary: X Window System initializer -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Source1: xinit.tar.bz2 Source2: keygen.c ++++++ xinit.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xinitrc new/etc/X11/xinit/xinitrc --- old/etc/X11/xinit/xinitrc 2010-11-03 12:46:56.000000000 +0100 +++ new/etc/X11/xinit/xinitrc 2012-07-02 11:30:33.000000000 +0200 @@ -27,8 +27,8 @@ # Run user xinit scripts. # for script in /etc/X11/xinit/xinitrc.d/*; do + test -e $script || continue test -d $script && continue - test -x $script || continue case "$script" in .*) continue ;; *.rpm*) continue ;; @@ -38,7 +38,15 @@ \#*) continue ;; *~) continue ;; esac - $script + if test -x $script ; then + if grep -qE "^# to be sourced" $script >/dev/null 2>&1; then + . $script + else + $script & + fi + else + . $script + fi done unset script -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
