rpms/xorg-x11-xinit/devel xinit-compat.desktop, NONE, 1.1 xorg-x11-xinit.spec, 1.55, 1.56

Ray Strode (rstrode) fedora-extras-commits at redhat.com
Wed Mar 12 16:45:29 UTC 2008


Author: rstrode

Update of /cvs/pkgs/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991

Modified Files:
	xorg-x11-xinit.spec 
Added Files:
	xinit-compat.desktop 
Log Message:
- Add a new subpackage to add ~/.xsessions and ~/.Xclients
  to session list



--- NEW FILE xinit-compat.desktop ---
[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"


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-xinit.spec	11 Feb 2008 19:24:01 -0000	1.55
+++ xorg-x11-xinit.spec	12 Mar 2008 16:44:39 -0000	1.56
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.7
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -19,6 +19,7 @@
 #       here instead of the xdm package.
 Source16: Xsession
 Source17: localuser.sh
+Source18: xinit-compat.desktop
 Source100: ck-xinit-session.c
 
 Patch1: xinit-1.0.2-client-session.patch
@@ -51,9 +52,16 @@
 # startup.
 Conflicts: dbus < 1.1.4-3.fc9
 
+%package session
+Summary: Display manager support for ~/.xsession and ~/.Xclients
+Group: User Interface/X
+
 %description
 X.Org X11 X Window System xinit startup scripts
 
+%description session
+Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch1 -p1 -b .client-session
@@ -77,6 +85,7 @@
 # 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 Red Hat custom xinitrc, etc.
 {
@@ -117,7 +126,15 @@
 %{_mandir}/man1/startx.1*
 %{_mandir}/man1/xinit.1*
 
+%files session
+%defattr(-, root, root)
+%{_datadir}/xsessions/xinit-compat.desktop
+
 %changelog
+* Wed Mar 12 2008 Ray Strode <rstrode at redhat.com> 1.0.7-6
+- Add a new subpackage to add ~/.xsessions and ~/.Xclients
+  to session list
+
 * Mon Feb 11 2008 Adam Jackson <ajax at redhat.com> 1.0.7-5
 - Xresources: s/don't/do not/, cpp is dumb. (#431704)
 




More information about the fedora-extras-commits mailing list