- Change Conflicts to "Obsoletes: XFree86-devel, xorg-x11-devel"

This commit is contained in:
mharris 2005-11-17 19:58:37 +00:00
parent dddbe03dac
commit e16e082b37

View File

@ -6,7 +6,7 @@
Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel
Version: 0.99.2
Release: 1
Release: 2
License: The Open Group License
Group: Development/System
URL: http://www.x.org
@ -48,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-util-macros
Conflicts: XFree86-devel, xorg-x11-devel
Obsoletes: XFree86-devel, xorg-x11-devel
%description
X.Org X11 Protocol headers
@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xproxymngproto.pc
%changelog
* Thu Nov 17 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
- Change Conflicts to "Obsoletes: XFree86-devel, xorg-x11-devel"
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
- Update to X11R7 RC2 release, picking up new xproto-7.0.2.