[xorg-x11-drv-synaptics] Update to today's git snapshot Switch define to global Append git version to NVR

[Peter Hutterer]

commit 664d494bf67ecc58745c25c1df0fc49e1f759a56
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jan 3 09:15:07 2012 +1000

    Update to today's git snapshot
    Switch define to global
    Append git version to NVR

 .gitignore                  |    2 ++
 sources                     |    2 +-
 xorg-x11-drv-synaptics.spec |   16 +++++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 72d3bd7..f7bff2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ xf86-input-synaptics-20100823.tar.bz2
 /xf86-input-synaptics-1.4.99.1.tar.bz2
 /xf86-input-synaptics-1.5.0.tar.bz2
 /xf86-input-synaptics-20111110.tar.bz2
+/xf86-input-synaptics-20120103.tar.bz2
+/xf86-input-synaptics-20120104.tar.bz2
diff --git a/sources b/sources
index 54d3d9b..23f7907 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b23c36c2633ab6fe98c5cdcdd27c6812  xf86-input-synaptics-20111110.tar.bz2
+2b63986510074ed166c9dd57d338d520  xf86-input-synaptics-20120104.tar.bz2
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 36855ac..bdce625 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -1,13 +1,14 @@
-%define tarball xf86-input-synaptics
-%define moduledir %(pkg-config xorg-server --variable=moduledir )
-%define driverdir %{moduledir}/input
+%global tarball xf86-input-synaptics
+%global moduledir %(pkg-config xorg-server --variable=moduledir )
+%global driverdir %{moduledir}/input
 
-%define gitdate 20111110
+%global gitdate 20120104
+%global gitversion c861d4568
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.5.99
-Release:        2%{?gitdate:.%{gitdate}}%{?dist}
+Release:        3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -133,6 +134,11 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Wed Jan 04 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99-3.20120104.gitc861d4568
+- Update to today's git snapshot
+- Switch define to global in spec file
+- Append git version to NVR
+
 * Mon Nov 14 2011 Adam Jackson <ajax at redhat.com> - 1.5.99-2.20111110
 - ABI rebuild