From 3f96d311757a410f5a77544891d8f868cec412a4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Jul 2009 06:20:20 +0000 Subject: [PATCH] * Wed Jul 15 2009 Peter Hutterer 1.6.99-13.20090715 - Today's git snapshot. --- .cvsignore | 2 +- commitid | 2 +- sources | 2 +- xorg-x11-server.spec | 9 ++++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 40fa88e..05a408f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20090714.tar.bz2 +xorg-server-20090715.tar.bz2 diff --git a/commitid b/commitid index 80ad698..312c05c 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -686e4867302a741f3029c4105b997d0f0ac7c13c +693babbf12cc7969c3e211c4037c7af0d41c13e9 diff --git a/sources b/sources index 1979748..d79817a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1be9eeb4f40a1d8c90f146a3ddff246f xorg-server-20090714.tar.bz2 +95878d40ed265bacb65f5c1de9a887bd xorg-server-20090715.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index fbf8f56..3f31535 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -14,12 +14,12 @@ # Fix rhpxl to no longer need vesamodes/extramodes %define pkgname xorg-server -%define gitdate 20090714 +%define gitdate 20090715 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.99 -Release: 12.%{gitdate}%{?dist} +Release: 13.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -97,7 +97,7 @@ BuildRequires: git-core BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.1.5 -BuildRequires: xorg-x11-proto-devel >= 7.4-10 +BuildRequires: xorg-x11-proto-devel >= 7.4-19 BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1 BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 15 2009 Peter Hutterer 1.6.99-13.20090715 +- Today's git snapshot. + * Tue Jul 14 2009 Adam Jackson 1.6.99-12.20090714 - Today's git snapshot. - Drop the %%pre script for Xorg, everyone ought to be migrated by now.