diff --git a/libXvMC.spec b/libXvMC.spec index 9052e90..25640fa 100644 --- a/libXvMC.spec +++ b/libXvMC.spec @@ -2,7 +2,7 @@ Summary: X.Org X11 libXvMC runtime library Name: libXvMC Version: 0.99.1 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -15,7 +15,7 @@ BuildRequires: libXext-devel BuildRequires: libXv-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXvMC runtime library @@ -26,7 +26,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Conflicts: XFree86-devel, xorg-x11-devel +Obsoletes: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXvMC development package @@ -85,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xvmc.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' + + * Mon Oct 24 2005 Mike A. Harris 0.99.1-1 - Updated libXvMC to version 0.99.1 from X11R7 RC1