From 6fff41459912914fd57732267d78b0ba730d9d60 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 11 Nov 2005 21:36:22 +0000 Subject: [PATCH] auto-import libXrandr-0.99.2-1 on branch devel from libXrandr-0.99.2-1.src.rpm --- .cvsignore | 2 +- libXrandr.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d81da84..8dca2ba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXrandr-0.99.1.tar.bz2 +libXrandr-0.99.2.tar.bz2 diff --git a/libXrandr.spec b/libXrandr.spec index 0b3a1bd..e322c13 100644 --- a/libXrandr.spec +++ b/libXrandr.spec @@ -1,6 +1,6 @@ Summary: X.Org X11 libXrandr runtime library Name: libXrandr -Version: 0.99.1 +Version: 0.99.2 Release: 1 License: MIT/X11 Group: System Environment/Libraries @@ -14,7 +14,7 @@ BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXrender-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXrandr runtime library @@ -24,7 +24,7 @@ Summary: X.Org X11 libXrandr 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 libXrandr development package @@ -80,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3x/*.3x* %changelog +* Fri Nov 11 2005 Mike A. Harris 0.99.2-1 +- Updated libXrandr to version 0.99.2 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 0.99.1-1 - Updated libXrandr to version 0.99.1 from X11R7 RC1 - Updated file manifest to find manpages in "man3x" diff --git a/sources b/sources index 534bf78..2dc8f4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f7bbb0b8644f0f84618af51583ca3f3 libXrandr-0.99.1.tar.bz2 +191fc44dd67200cb0e7b4d1b2ed5388c libXrandr-0.99.2.tar.bz2