rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3585

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
* Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-6
- Add "Requires: xauth" for startx, to fix bug (#173684)



Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xinit.spec	14 Nov 2005 22:42:10 -0000	1.10
+++ xorg-x11-xinit.spec	23 Nov 2005 02:25:56 -0000	1.11
@@ -3,10 +3,12 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: 0.99.3
-Release: 5
+Release: 6
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/%{pkgname}-%{version}.tar.bz2
 Source10: xinitrc-common
 Source11: xinitrc
@@ -14,19 +16,22 @@
 Source13: Xmodmap
 Source14: Xresources
 Source15: xinput.sh
-# Xsession is used by xdm/kdm/gdm and possibly others, so let's keep it here.
+# NOTE: Xsession is used by xdm/kdm/gdm and possibly others, so we keep it
+#       here instead of the xdm package.
 Source16: Xsession
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
+# NOTE: startx needs xauth in order to run, but that is not picked up
+#       automatically by rpm.  (Bug #173684)
+Requires: xauth
 
 # NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
 # modularization.  These Conflicts lines ensure upgrades work smoothly.
 Conflicts: XFree86, xorg-x11
 
 # NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit,
-# so xinitrc became unnecessary.  The xdm configs/scripts move to the xdm
-# package.
+# so the xinitrc package became unnecessary.  The xdm configs/scripts move
+# to the xdm package.
 Obsoletes: xinitrc
 
 %description
@@ -88,9 +93,12 @@
 %{_mandir}/man1x/xinit.1x*
 
 %changelog
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0.99.3-5
-- don't provide xinit anymore, gdm has been fixed and that breaks things with 
-  the obsoletes
+* Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-6
+- Add "Requires: xauth" for startx, to fix bug (#173684)
+
+* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.3-5
+- Do not provide xinit anymore, gdm has been fixed and that breaks things
+  with the obsoletes
 
 * Sat Nov 12 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-4
 - Added Xsession script from xinitrc, as it is very similar codebase, which