[xorg-x11-drv-void] - Add git hooks, update to today's snapshot
Peter Hutterer
whot at fedoraproject.org
Wed Dec 1 22:55:54 UTC 2010
commit a7263c00dd48d8a494609c33282affe1fe320569
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Dec 2 08:50:18 2010 +1000
- Add git hooks, update to today's snapshot
.gitignore | 1 +
sources | 2 +-
xorg-x11-drv-void.spec | 23 +++++++++++++++++++----
3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 654062d..f968e19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xf86-input-void-1.3.0.tar.bz2
/xf86-input-void-1.3.1.tar.bz2
+/xf86-input-void-20101202.tar.bz2
diff --git a/sources b/sources
index 3b28440..d8b9933 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3056bc7c57db8c5d56039648c0530c45 xf86-input-void-1.3.1.tar.bz2
+f4a9304ac045a3644a169259aec9e15c xf86-input-void-20101202.tar.bz2
diff --git a/xorg-x11-drv-void.spec b/xorg-x11-drv-void.spec
index f9647cb..661369d 100644
--- a/xorg-x11-drv-void.spec
+++ b/xorg-x11-drv-void.spec
@@ -2,19 +2,30 @@
%global moduledir %(pkg-config xorg-server --variable=moduledir )
%global driverdir %{moduledir}/input
+%global gitdate 20101202
+%global gitversion cb8d19b8a
+
Summary: Xorg X11 void input driver
Name: xorg-x11-drv-void
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
-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
-BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
+BuildRequires: autoconf automake libtool
+BuildRequires: xorg-x11-server-sdk >= 1.9.99.1
BuildRequires: xorg-x11-util-macros >= 1.3.0
Requires: Xorg %(xserver-sdk-abi-requires ansic)
@@ -24,9 +35,10 @@ Requires: Xorg %(xserver-sdk-abi-requires xinput)
X.Org X11 void input driver.
%prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%build
+autoreconf -v --install || exit 1
%configure --disable-static
make
@@ -49,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/void.4*
%changelog
+* Thu Dec 02 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.3.1-2.20101202gitcb8d19b8a
+- Add git hooks, update to today's snapshot
+
* Mon Nov 01 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.3.1-1
- void 1.3.1
More information about the scm-commits
mailing list