[packages/xinitrc-ng] as ~/.Xclients is (only) executed, then check for x-bit

[glen]

commit b0462588eae547b1314ccd014e639c32057e8b97
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jun 6 01:34:07 2014 +0300

    as ~/.Xclients is (only) executed, then check for x-bit

 xinitrc-execute.patch | 11 +++++++++++
 xinitrc-ng.spec       |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/xinitrc-ng.spec b/xinitrc-ng.spec
index 8193185..5d74f39 100644
--- a/xinitrc-ng.spec
+++ b/xinitrc-ng.spec
@@ -4,11 +4,12 @@ Summary:	The default startup scripts for the X Window System
 Summary(pl.UTF-8):	Domyślne skrypty startowe X Window System
 Name:		xinitrc-ng
 Version:	1.1
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	f369317256368bf00dd07957929d5a63
+Patch0:		xinitrc-execute.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/xinitrc-ng
 Requires:	/bin/sh
 Requires:	which
@@ -16,10 +17,10 @@ Requires:	xorg-app-setxkbmap
 Requires:	xorg-app-twm
 Requires:	xorg-app-xmodmap
 Requires:	xorg-app-xrdb
-Conflicts:	lightdm < 1.7.12-4
 Provides:	xinitrc >= 3.0
 Obsoletes:	xinitrc < 3.0
 Obsoletes:	xscripts
+Conflicts:	lightdm < 1.7.12-4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,6 +34,7 @@ odpowiednie plik konfiguracyjne.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/xinitrc-execute.patch b/xinitrc-execute.patch
new file mode 100644
index 0000000..d7a50ce
--- /dev/null
+++ b/xinitrc-execute.patch
@@ -0,0 +1,11 @@
+--- xinitrc-ng-1.1/xinitrc~	2011-07-27 23:59:12.000000000 +0300
++++ xinitrc-ng-1.1/xinitrc	2014-06-06 01:33:19.861745454 +0300
+@@ -3,7 +3,7 @@
+ # Call standard xinit actions
+ . /etc/X11/xinit/xinitdefs
+ 
+-if [ -f $HOME/.Xclients ]; then
++if [ -x $HOME/.Xclients ]; then
+ 	exec $HOME/.Xclients "$@"
+ else
+ 	exec /etc/X11/xinit/Xclients "$@"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xinitrc-ng.git/commitdiff/b0462588eae547b1314ccd014e639c32057e8b97