[xorg-x11-drv-mutouch] - Add git hooks, update to today's git snapshot
Peter Hutterer
whot at fedoraproject.org
Mon Dec 6 05:44:06 UTC 2010
commit f48d26970834e51c8a2ff6dcc419808a4d13a1a2
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Dec 6 15:43:53 2010 +1000
- Add git hooks, update to today's git snapshot
commitid | 1 +
make-git-snapshot.sh | 18 +++++++++++
mutouch-1.2.1-abi.patch | 73 ---------------------------------------------
xorg-x11-drv-mutouch.spec | 24 +++++++++++----
4 files changed, 37 insertions(+), 79 deletions(-)
---
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..ca9240e
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+24029451c591d324fc6e4a64d0bba70841bb1725
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..c2007cf
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+MODULE=mutouch
+DIRNAME=xf86-input-$MODULE-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/driver/xf86-input-$MODULE $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
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
diff --git a/xorg-x11-drv-mutouch.spec b/xorg-x11-drv-mutouch.spec
index d6245bd..74fe0f0 100644
--- a/xorg-x11-drv-mutouch.spec
+++ b/xorg-x11-drv-mutouch.spec
@@ -2,19 +2,28 @@
%global moduledir %(pkg-config xorg-server --variable=moduledir )
%global driverdir %{moduledir}/input
+%global gitdate 20101206
+%global gitversion 24029451c
+
Summary: Xorg X11 mutouch input driver
Name: xorg-x11-drv-mutouch
-Version: 1.2.1
-Release: 8%{?dist}
+Version: 1.2.99
+Release: 1%{?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
-Patch1: mutouch-1.2.1-abi.patch
+%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: autoconf automake libtool
BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
Requires: Xorg %(xserver-sdk-abi-requires ansic)
@@ -24,10 +33,10 @@ Requires: Xorg %(xserver-sdk-abi-requires xinput)
X.Org X11 mutouch input driver.
%prep
-%setup -q -n %{tarball}-%{version}
-%patch1 -p1
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%build
+autoreconf -v --install || exit 1
%configure --disable-static
make
@@ -49,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/mutouch.4*
%changelog
+* Mon Dec 06 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-1.20101206git24029451c
+- Add git hooks, update to today's git snapshot
+
* Wed Oct 27 2010 Adam Jackson <ajax at redhat.com> 1.2.1-8
- Add ABI requires magic (#542742)
More information about the scm-commits
mailing list