rpms/xorg-x11-xinit/F-12 xinit-compat, NONE, 1.1 xinit-compat.desktop, 1.1, 1.2 xorg-x11-xinit.spec, 1.73, 1.74

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/xorg-x11-xinit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8185

Modified Files:
	xinit-compat.desktop xorg-x11-xinit.spec 
Added Files:
	xinit-compat 
Log Message:
Simplify xinit-compat Exec (fixes bug# 540546)


--- NEW FILE xinit-compat ---
#/bin/sh
for session in ~/.xsession ~/.Xclients /etc/X11/xinit/Xclients ;
do
if [ -f ${session} ] ; then
  exec ${session}
fi
done


Index: xinit-compat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/F-12/xinit-compat.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinit-compat.desktop	12 Mar 2008 16:44:39 -0000	1.1
+++ xinit-compat.desktop	15 Mar 2010 17:01:03 -0000	1.2
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=User script
 Comment=This session runs ~/.xsession or ~/.Xclients if available
-Exec=sh -c "exec ~/.xsession || exec ~/.Xclients || exec /etc/X11/xinit/Xclients"
+Exec=/usr/libexec/xinit-compat


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/F-12/xorg-x11-xinit.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- xorg-x11-xinit.spec	29 Jan 2010 15:46:09 -0000	1.73
+++ xorg-x11-xinit.spec	15 Mar 2010 17:01:03 -0000	1.74
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.9
-Release:   14%{?dist}
+Release:   15%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -20,6 +20,7 @@ Source14: Xresources
 Source16: Xsession
 Source17: localuser.sh
 Source18: xinit-compat.desktop
+Source19: xinit-compat
 Source100: ck-xinit-session.c
 
 Patch1: xinit-1.0.2-client-session.patch
@@ -75,9 +76,9 @@ autoreconf
 # Makefile.am and submit it in a bug report or check into CVS.
 make XINITDIR=/etc/X11/xinit
 %{__cc} -o ck-xinit-session \
-	`pkg-config --cflags ck-connector dbus-1` $RPM_OPT_FLAGS \
-	$RPM_SOURCE_DIR/ck-xinit-session.c \
-	`pkg-config --libs ck-connector dbus-1`
+    `pkg-config --cflags ck-connector dbus-1` $RPM_OPT_FLAGS \
+    %{SOURCE100} \
+    `pkg-config --libs ck-connector dbus-1`
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 # Makefile.am and submit it in a bug report or check into CVS.
 %makeinstall XINITDIR=$RPM_BUILD_ROOT/etc/X11/xinit
 install -m755 ck-xinit-session $RPM_BUILD_ROOT/%{_bindir}
-install -m644 -D $RPM_SOURCE_DIR/xinit-compat.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
+install -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
 
 # Install Red Hat custom xinitrc, etc.
 {
@@ -102,6 +103,9 @@ install -m644 -D $RPM_SOURCE_DIR/xinit-c
     install -m 755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
 
     mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d
+
+    mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+    install -m 755 %{SOURCE19} $RPM_BUILD_ROOT%{_libexecdir}
 }
 
 %clean
@@ -109,10 +113,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS ChangeLog
-%{_bindir}/startx
-%{_bindir}/xinit
-%{_bindir}/ck-xinit-session
+%doc COPYING README ChangeLog
+%attr(755,-,root) %{_bindir}/startx
+%attr(755,-,root) %{_bindir}/xinit
+%attr(755,-,root) %{_bindir}/ck-xinit-session
+%attr(755,-,root) %{_libexecdir}/xinit-compat
 %dir %{_sysconfdir}/X11/xinit
 %{_sysconfdir}/X11/xinit/xinitrc
 %{_sysconfdir}/X11/xinit/xinitrc-common
@@ -132,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Thu Feb 04 2010 Matěj Cepl <mcepl at redhat.com> - 1.0.9-15
+- Add xinit-compat script
+  Patch from Rex Dieter, bug 540546
+
 * Fri Jan 29 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-14
 - Eliminate dependency on which.
 - Change Xclients, Xsession and xinitrc-common to make fewer stat calls.
@@ -230,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jul 29 2007 Soren Sandmann <sandmann at redhat.com> 1.0.2-23
 - Fix Xsession to run the login shell inside the setgid ssh-agent, rather
   than the other way around. This preserves LD_LIBRARY_PRELOAD.
-	Patch from Stefan Becker, bug 164869.
+  Patch from Stefan Becker, bug 164869.
 
 * Fri Jul 27 2007 Soren Sandmann <sandmann at redhat.com> 1.0.2-22
 - Remove xinput.sh. Bug 244963.