diff --git a/libXp.spec b/libXp.spec index 505c809..67a5eea 100644 --- a/libXp.spec +++ b/libXp.spec @@ -1,22 +1,22 @@ %define libXp_deprecated 0 Summary: X.Org X11 libXp runtime library -#FIXME: Change name to xorg-x11-deprecated-libs like before? Name: libXp Version: 0.99.1 -Release: 2 +Release: 3 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXau-devel -Obsoletes: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs, xorg-x11-deprecated-libs %description X.Org X11 libXp runtime library @@ -27,7 +27,7 @@ Summary: X.Org X11 libXp development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: XFree86-devel, xorg-x11-devel +Obsoletes: XFree86-devel, xorg-x11-devel, xorg-x11-deprecated-libs-devel %description devel X.Org X11 libXp development package @@ -96,15 +96,18 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Nov 16 2005 Mike A. Harris 0.99.1-3 +- Added "Obsoletes: xorg-x11-deprecated-libs" to runtime package, and + "Obsoletes: xorg-x11-deprecated-libs-devel" to devel package. + * 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 libXp to version 0.99.1 from X11R7 RC1 -* Thu Sep 29 2005 Mike A. Harris 0.99.0-3 +* Thu Sep 29 2005 Mike A. Harris 0.99.0-3 - Renamed package to remove xorg-x11 from the name due to unanimous decision between developers. - Use Fedora Extras style BuildRoot tag.