[xorg-x11-drv-evdev] automatically use git sources if gitdate is defined

[Peter Hutterer]

commit ff875db31fdee86493671e578b1bde2cd616d539
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Aug 23 11:32:09 2010 +1000

    automatically use git sources if gitdate is defined
    
    Conflicts:
    
    	xorg-x11-drv-evdev.spec

 xorg-x11-drv-evdev.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-evdev.spec b/xorg-x11-drv-evdev.spec
index 6aec357..1dac80a 100644
--- a/xorg-x11-drv-evdev.spec
+++ b/xorg-x11-drv-evdev.spec
@@ -7,16 +7,19 @@
 Summary:    Xorg X11 evdev input driver
 Name:       xorg-x11-drv-evdev
 Version:    2.4.99.901
-Release:    1.%{?gitdate}%{?dist}
+Release:    1%{?gitdate:.%{gitdate}}%{dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+%if 0%{?gitdate}
 Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
+%else
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+%endif
 
 ExcludeArch: s390 s390x
 
@@ -32,8 +35,7 @@ Requires:  xkeyboard-config >= 1.4-1
 X.Org X11 evdev input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install || exit 1
@@ -74,6 +76,9 @@ X.Org X11 evdev input driver development files.
 
 
 %changelog
+* Mon Aug 23 2010 Peter Hutterer <peter.hutterer at redhat.com>
+- automatically use git sources if gitdate is defined
+
 * Thu Aug 19 2010 Peter Hutterer <peter.hutterer at redhat.com> 2.4.99.901-1.20100819
 - evdev 2.4.99.901 from git