diff --git a/libXi.spec b/libXi.spec index bbc718f..e6cac2e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 0.99.1 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -12,7 +12,7 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXext-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXi runtime library @@ -22,7 +22,7 @@ Summary: X.Org X11 libXi 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 libXi development package @@ -75,6 +75,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3x/*.3* %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' + + * Mon Oct 24 2005 Mike A. Harris 0.99.1-1 - Updated libXi to version 0.99.1 from X11R7 RC1 - Updated file manifest to find manpages in "man3x"