From b34eb7be0c31696c14953c231540ece1b683796b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Feb 21 2008 21:42:28 +0000
Subject: Today's git snapshot.  Misc, other.


---

diff --git a/.cvsignore b/.cvsignore
index c2b4ad6..63f520f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-20080215.tar.bz2
+xorg-server-20080221.tar.bz2
diff --git a/commitid b/commitid
index 2371c93..d49c7a8 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-0ffb6a3ad010e80fe8f973fc228d549f9dd3effd
+c14fd2a5cb3f45d5c4502e09f55f5e3732c5e698
diff --git a/sources b/sources
index d4d9d90..494a289 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-562c750bd294847e2829e8e2913cfbe4  xorg-server-20080215.tar.bz2
+d3dd5a48d161bcb5d02cf897b1f49ebd  xorg-server-20080221.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6736163..0280037 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -15,7 +15,7 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080215
+%define gitdate 20080221
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
@@ -118,7 +118,7 @@ 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.5
+BuildRequires: mesa-source >= 7.1-0.16
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0
 %if %{with_hw_servers}
@@ -280,6 +280,8 @@ git checkout -b fedora-%{version}-%{release}
 sed -i 's/git/&+ssh/' .git/config
 %else
 git-init-db
+echo "This is incomplete.  FIXME."
+exit 1
 %endif
 
 if [ -z "$GIT_COMMITTER_NAME" ]; then
@@ -511,8 +513,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.4.99.1-0.22.20080215
-- Autorebuild for GCC 4.3
+* Thu Feb 21 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.22
+- Today's git snapshot, misc bugfixes.
 
 * Fri Feb 15 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.21
 - Today's git snapshot.  Features DRI2 and input hotplugging.  Tasty.