do not load backup files from /etc/X11/xinit/xinitrc.d

source only known *.sh files

see also similar thread in xinitrc-ng
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-January/022432.html

and http://svn.pld-linux.org/trac/svn/changeset/12470/xinitrc-ng/trunk/xinitdefs

diff --git a/gdm2.20.spec b/gdm2.20.spec
index f7ada5550264fef0818f8c818fdc52bb12cc7f66..cd78702980943bca3eb7dc7f0940157a0fe47882 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -5,7 +5,7 @@
 #
 # Conditiional build:
 %bcond_without selinux # without selinux
-#
+
 Summary:       GNOME Display Manager
 Summary(es.UTF-8):     Administrador de Entrada del GNOME
 Summary(ja.UTF-8):     GNOME ディスプレイマネージャ
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):    Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm2.20
 Version:       2.20.11
-Release:       5
+Release:       6
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Patch1:               gdm-conf.patch
 Patch2:                gdm-xsession.patch
 Patch3:                gdm-desktop.patch
 Patch4:                gdm-defaults.patch
+Patch5:                xinit-sh.patch
 URL:           http://www.gnome.org/projects/gdm/
 BuildRequires: ConsoleKit-devel
 BuildRequires: attr-devel

diff --git a/xinit-sh.patch b/xinit-sh.patch
new file mode 100644 (file)
index 0000000..90fffa9
--- /dev/null
+++ b/xinit-sh.patch
@@ -0,0 +1,11 @@
+--- gdm-2.20.11/config/Xsession.in~    2013-03-06 00:17:36.000000000 +0200
++++ gdm-2.20.11/config/Xsession.in     2013-03-06 00:18:31.189137195 +0200
+@@ -183,7 +183,7 @@
+ 
+ # run all system xinitrc shell scripts.
+ if [ -d /etc/X11/xinit/xinitrc.d ]; then
+-    for i in /etc/X11/xinit/xinitrc.d/* ; do
++    for i in /etc/X11/xinit/xinitrc.d/*.sh; do
+         if [ -x "$i" ]; then
+           . "$i"
+         fi