- don't provide xinit anymore, gdm has been fixed and that breaks things

with the obsoletes
This commit is contained in:
Jeremy Katz 2005-11-14 22:42:10 +00:00
parent 0028e3f558
commit 99d8928a9d

View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 0.99.3 Version: 0.99.3
Release: 4 Release: 5
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -28,12 +28,6 @@ Conflicts: XFree86, xorg-x11
# so xinitrc became unnecessary. The xdm configs/scripts move to the xdm # so xinitrc became unnecessary. The xdm configs/scripts move to the xdm
# package. # package.
Obsoletes: xinitrc Obsoletes: xinitrc
#Conflicts: xinitrc
# FIXME: This virtual provide is temporary only, to make it easier during
# the FC5 migration from monolithic X to modular X. Once we have gotten
# modular X into rawhide, this provide will be removed once all FC5 packages
# have weaned their usage of it.
Provides: xinitrc = 5.0.0-1
%description %description
X.Org X11 X Window System xinit startup scripts X.Org X11 X Window System xinit startup scripts
@ -94,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1x/xinit.1x* %{_mandir}/man1x/xinit.1x*
%changelog %changelog
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 0.99.3-5
- don't provide xinit anymore, gdm has been fixed and that breaks things with
the obsoletes
* Sat Nov 12 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-4 * Sat Nov 12 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-4
- Added Xsession script from xinitrc, as it is very similar codebase, which - Added Xsession script from xinitrc, as it is very similar codebase, which
shares "xinitrc-common" anyway, and all of the display managers use it. shares "xinitrc-common" anyway, and all of the display managers use it.