diff --git a/.cvsignore b/.cvsignore index 74c8209..6018979 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -libXdmcp-0.99.0.tar.bz2 libXdmcp-0.99.1.tar.bz2 diff --git a/libXdmcp.spec b/libXdmcp.spec index f262b4e..5e60c71 100644 --- a/libXdmcp.spec +++ b/libXdmcp.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXdmcp runtime library Name: libXdmcp Version: 0.99.1 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXdmcp runtime library @@ -20,7 +20,7 @@ Summary: X.Org X11 libXdmcp development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Conflicts: XFree86-devel, xorg-x11-devel +Obsoletes: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXdmcp development package @@ -71,6 +71,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xdmcp.pc %changelog +* Fri Nov 11 2005 Mike A. Harris 0.99.1-2 +- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' +- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' + + * Fri Oct 21 2005 Mike A. Harris 0.99.1-1 - Update to libXdmcp-0.99.1 from X11R7 RC1 release. diff --git a/sources b/sources index 4c481e3..c15efb8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -bb45d98b1319e40d0515a11fe4bd45b9 libXdmcp-0.99.0.tar.bz2 99ddb6fa2cb00f4cef3d0fffb16229fb libXdmcp-0.99.1.tar.bz2