From 4ef5ee7f4921b2a3c0466befbd072f0e604f112c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Dec 22 2008 07:10:54 +0000
Subject: * Mon Dec 22 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-2

- Update to today's server-1.6  branch tip.

---

diff --git a/.cvsignore b/.cvsignore
index 7fee574..b6986ad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-1.5.99.3.tar.bz2
+xorg-server-20081222.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..ec68cd5
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+32e81074b967716865aef08b66ec29caf0fec2c5
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..d56bf4f
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+DIRNAME=xorg-server-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/xserver $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+git log | head -1 | awk '{ print $2 }' > ../commitid
+git repack -a -d
+git-config user.email "x@fedoraproject.org"
+git-config user.name "Fedora X Ninjas"
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
diff --git a/sources b/sources
index 06805fc..3a365b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db87577456968e64c774124cc761cc7c  xorg-server-1.5.99.3.tar.bz2
+45e1a7b1104de5044477901b4cb12e62  xorg-server-20081222.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3f1b239..514515a 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 20080701
+%define gitdate 20081222
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -493,6 +493,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 22 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-2
+- Update to today's server-1.6  branch tip.
+
 * Fri Dec 19 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-1
 - xserver 1.5.99.3
 - drop patches merged into master