diff --git a/.cvsignore b/.cvsignore index 0427084..16f52e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -libXau-0.99.0.tar.bz2 libXau-0.99.1.tar.bz2 diff --git a/libXau.spec b/libXau.spec index f9943ee..a56f731 100644 --- a/libXau.spec +++ b/libXau.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXau runtime library Name: libXau 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 libXau runtime library @@ -20,7 +20,7 @@ Summary: X.Org X11 libXau 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 libXau development package @@ -83,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3x/XauWriteAuth.3x* %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 libXau-0.99.1 from X11R7 RC1 release. - Added manpages that were absent in X11R7 RC0, and updated the file lists diff --git a/sources b/sources index f7ae964..13d04aa 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -1c5c9779d78f45267cae2e6cc1856517 libXau-0.99.0.tar.bz2 52fad27508690e46d30b56856b1b5d1a libXau-0.99.1.tar.bz2