From 455df272e8249dc1ca8155a9bf84988762013dc4 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 16 Dec 2005 11:04:59 +0000 Subject: [PATCH] auto-import libXcomposite-0.2.2.2-1 on branch devel from libXcomposite-0.2.2.2-1.src.rpm --- .cvsignore | 2 +- libXcomposite.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index edd6e37..ef8e702 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXcomposite-0.2.2.1.tar.bz2 +libXcomposite-0.2.2.2.tar.bz2 diff --git a/libXcomposite.spec b/libXcomposite.spec index 9b1c167..a157064 100644 --- a/libXcomposite.spec +++ b/libXcomposite.spec @@ -1,20 +1,19 @@ - Summary: X.Org X11 libXcomposite runtime library Name: libXcomposite -Version: 0.2.2.1 +Version: 0.2.2.2 Release: 1 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 +Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/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: libXfixes-devel - Obsoletes: XFree86-libs, xorg-x11-libs %description @@ -26,7 +25,6 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 - Obsoletes: XFree86-devel, xorg-x11-devel %description devel @@ -80,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xcomposite.pc %changelog +* Fri Dec 16 2005 Mike A. Harris 0.2.2.2-1 +- Updated libXcomposite to version 0.2.2.2 from X11R7 RC4 + * Tue Dec 13 2005 Mike A. Harris 0.2.2.1-1 - Updated libXcomposite to version 0.2.2.1 from X11R7 RC3 - Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure @@ -94,11 +95,10 @@ rm -rf $RPM_BUILD_ROOT - 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.2.1-1 - Updated libXcomposite to version 0.2.1 from X11R7 RC1 -* Thu Sep 29 2005 Mike A. Harris 0.2.0-3 +* Thu Sep 29 2005 Mike A. Harris 0.2.0-3 - Renamed package to remove xorg-x11 from the name due to unanimous decision between developers. - Use Fedora Extras style BuildRoot tag. diff --git a/sources b/sources index 1dc33e0..41a09cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -374182cfcf7fa4f90727b49d4916a817 libXcomposite-0.2.2.1.tar.bz2 +e4a4cda4c6bcf4fcfcf71f216590171d libXcomposite-0.2.2.2.tar.bz2