From 503c23afda780bc9d0c32db31bf25c7d6959ccb3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mar 07 2008 18:38:38 +0000 Subject: today's git snapshot --- diff --git a/.cvsignore b/.cvsignore index aea1581..c13df87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20080304.tar.bz2 +xorg-server-20080307.tar.bz2 diff --git a/commitid b/commitid index 6882e99..111a29d 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -e4d92a13e83b4327067c97d8c9fe151a1c0b35af +ef702d586697c4ae9092ab0a412719c11973ec60 diff --git a/sources b/sources index 7472b04..a33d1f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e81f00d089163f9a88bc89e73da0b2c3 xorg-server-20080304.tar.bz2 +04ea8f94db434f0629b8ce7ff68a1087 xorg-server-20080307.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index bd69d0c..b9e1307 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080304 +%define gitdate 20080307 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.900 -Release: 0.28.%{gitdate}%{?dist} +Version: 1.4.99.901 +Release: 1.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -108,8 +108,8 @@ BuildRequires: libXv-devel # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1 -BuildRequires: mesa-source >= 7.1-0.16 +BuildRequires: mesa-libGL-devel >= 7.1-0.19 +BuildRequires: mesa-source >= 7.1-0.19 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -506,6 +506,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 07 2008 Adam Jackson 1.4.99.901-1.20080307 +- Today's 1.5 snapshot. + * Tue Mar 04 2008 Adam Jackson 1.4.99.900-0.28.20080304 - Today's 1.5 snapshot. - Obsolete: xorg-x11-drv-magictouch to get it uninstalled.