From 10ccdb8d8fa697136bedab524cdae951dfb4c425 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 11 Nov 2005 21:34:08 +0000 Subject: [PATCH] auto-import libXfixes-3.0.1-1 on branch devel from libXfixes-3.0.1-1.src.rpm --- .cvsignore | 2 +- libXfixes.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f45ad50..ea1ba15 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXfixes-3.0.0.tar.bz2 +libXfixes-3.0.1.tar.bz2 diff --git a/libXfixes.spec b/libXfixes.spec index 3d4c91d..b08612e 100644 --- a/libXfixes.spec +++ b/libXfixes.spec @@ -1,8 +1,8 @@ Summary: X.Org X11 libXfixes runtime library Name: libXfixes -Version: 3.0.0 -Release: 4 +Version: 3.0.1 +Release: 1 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXfixes runtime library @@ -23,7 +23,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 libXfixes development package @@ -79,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Xfixes.3* %changelog +* Fri Nov 11 2005 Mike A. Harris 3.0.1-1 +- Updated libXfixes to version 3.0.1 from X11R7 RC2 +- 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 3.0.0-4 - Updated libXfixes to version 3.0.0 from X11R7 RC1 diff --git a/sources b/sources index 10fbc2a..2f53d04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3ecf24e050dcc613dd3ceea4672b40f libXfixes-3.0.0.tar.bz2 +b27fe7c29da0ea728daa250c9116c53a libXfixes-3.0.1.tar.bz2