rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.35,1.36

[Ray Strode (rstrode)]

Author: rstrode

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

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
- Use system Xsession script (bug 244264)



Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-xdm.spec	16 Aug 2007 23:43:41 -0000	1.35
+++ xorg-x11-xdm.spec	24 Aug 2007 14:03:31 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -64,6 +64,9 @@
 # requiring additional changes to xdm.pamd. (bug #170661)
 Requires: pam >= 0.78-0
 
+# We want to use the system Xsession script
+Requires: xorg-x11-xinit
+
 %description
 X.Org X11 xdm - X Display Manager
 
@@ -105,6 +108,9 @@
    install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm
 }
 
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsession
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm; ln -sf ../xinit/Xsession .)
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -150,6 +156,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Aug 24 2007 Ray Strode <rstrode at redhat.com> 1:1.1.6-2
+- Use system Xsession script (bug 244264)
+
 * Fri Aug 17 2007 Dave Airlie <airlied at redhat.com> 1:1.1.6-1
 - Update to 1.1.6