diff --git a/SOURCES/xinitrc-common b/SOURCES/xinitrc-common index 000ab67..3804b4a 100644 --- a/SOURCES/xinitrc-common +++ b/SOURCES/xinitrc-common @@ -34,22 +34,18 @@ sysxkbmap=/etc/X11/Xkbmap # merge in keymaps if [ -r "$sysxkbmap" ]; then setxkbmap $(cat "$sysxkbmap") - XKB_IN_USE=yes fi if [ -r "$userxkbmap" ]; then setxkbmap $(cat "$userxkbmap") - XKB_IN_USE=yes fi # xkb and xmodmap don't play nice together -if [ -z "$XKB_IN_USE" ]; then +if ! [ -r "$sysxkbmap" -o -r "$userxkbmap" ] ; then [ -r "$sysmodmap" ] && xmodmap "$sysmodmap" [ -r "$usermodmap" ] && xmodmap "$usermodmap" fi -unset XKB_IN_USE - # run all system xinitrc shell scripts. for file in /etc/X11/xinit/xinitrc.d/* ; do . $file diff --git a/SPECS/xorg-x11-xinit.spec b/SPECS/xorg-x11-xinit.spec index a60fbb4..934acac 100644 --- a/SPECS/xorg-x11-xinit.spec +++ b/SPECS/xorg-x11-xinit.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} Version: 1.3.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -116,6 +116,9 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa %{_datadir}/xsessions/xinit-compat.desktop %changelog +* Fri Aug 25 2017 Adam Jackson - 1.3.4-2 +- Make xinitrc-common tolerate set -u + * Tue May 12 2015 Hans de Goede - 1.3.4-1 - xinit 1.3.4 - Drop xorg-x11-xinit-1.3.2-systemd-logind.patch (included upstream in 1.3.4)