rpms/xorg-x11-xinit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Change Conflicts to Obsoletes for xorg-x11 and XFree86 (#181414)

Browse Source
This commit is contained in:
mharris 2006-02-16 14:48:14 +00:00
parent a4192e98af
commit 55310d379d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xorg-x11-xinit.spec
View File

@ -3,13 +3,13 @@
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: 1.0.1 Version: 1.0.1
Release: 1.2 Release: 2
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
Source10: xinitrc-common Source10: xinitrc-common
Source11: xinitrc Source11: xinitrc
Source12: Xclients Source12: Xclients
@ -26,8 +26,8 @@ BuildRequires: libX11-devel
Requires: xauth Requires: xauth
# NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7 # NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
# modularization. These Conflicts lines ensure upgrades work smoothly. # modularization. These Obsoletes lines ensure upgrades work smoothly.
Conflicts: XFree86, xorg-x11 Obsoletes: XFree86, xorg-x11
# NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit, # NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit,
# so the xinitrc package became unnecessary. The xdm configs/scripts move # so the xinitrc package became unnecessary. The xdm configs/scripts move
@ -73,7 +73,6 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %doc
%dir %{_bindir}
%{_bindir}/startx %{_bindir}/startx
%{_bindir}/xinit %{_bindir}/xinit
%dir %{_sysconfdir}/X11 %dir %{_sysconfdir}/X11
@ -87,12 +86,14 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/X11/xinit/Xsession %{_sysconfdir}/X11/xinit/Xsession
%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xinit/xinitrc.d
%{_sysconfdir}/X11/xinit/xinitrc.d/* %{_sysconfdir}/X11/xinit/xinitrc.d/*
%dir %{_mandir} #%dir %{_mandir}/man1x
%dir %{_mandir}/man1
%{_mandir}/man1/startx.1x* %{_mandir}/man1/startx.1x*
%{_mandir}/man1/xinit.1x* %{_mandir}/man1/xinit.1x*
%changelog %changelog
* Thu Feb 16 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
- Change Conflicts to Obsoletes for xorg-x11 and XFree86 (#181414)
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-1.2 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-1.2
- bump again for double-long bug on ppc(64) - bump again for double-long bug on ppc(64)