[xorg-x11-drv-wacom] Align git snapshot building with other drivers
Peter Hutterer
whot at fedoraproject.org
Sun Aug 5 01:41:54 UTC 2012
commit 4a8cf473f20719c41201641f351eb4755671940b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun Aug 5 11:39:26 2012 +1000
Align git snapshot building with other drivers
- Add autotools/libtool to BuildRequires, we need those when building git
snapshots
- Always run autoreconf
xorg-x11-drv-wacom.spec | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 6086425..7c0f023 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -4,21 +4,24 @@
# Disable gitdate to build from a fixed release
#global gitdate 20111110
+#global gitversion 12345689
Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom
Version: 0.16.0
-Release: 4%{?gitdate:.%{gitdate}}%{?dist}
+Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
URL: http://www.x.org
License: GPLv2+
Group: User Interface/X Hardware Support
%if 0%{?gitdate}
Source0: %{tarball}-%{gitdate}.tar.bz2
+Source1: make-git-snapshot.sh
+Source2: commitid
%else
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
%endif
-Source1: 70-wacom.rules
+Source3: 70-wacom.rules
Patch01: 0001-Add-Cintiq-22HD.patch
@@ -27,6 +30,7 @@ ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
BuildRequires: xorg-x11-util-macros >= 1.3.0
BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel
+BuildRequires: autoconf automake libtool
BuildRequires: systemd-devel
Requires: Xorg %(xserver-sdk-abi-requires ansic)
@@ -43,10 +47,7 @@ X.Org X11 wacom input driver for Wacom tablets.
%patch01 -p1
%build
-%if 0%{?gitdate}
-autoreconf -v --install || exit 1
-%endif
-
+autoreconf --force -v --install || exit 1
%configure --disable-static --disable-silent-rules --enable-debug
make %{_smp_mflags}
@@ -60,7 +61,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules
%clean
rm -rf $RPM_BUILD_ROOT
@@ -100,6 +101,12 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger
%changelog
+* Sun Aug 05 2012 Peter Hutterer <peter.hutterer at redhat.com> 0.16.0-5
+- Align git snapshot building with other drivers
+- Add autotools/libtool to BuildRequires, we need those when building git
+ snapshots
+- Always run autoreconf
+
* Sun Aug 05 2012 Peter Hutterer <peter.hutterer at redhat.com> 0.16.0-4
- Add support for Cintiq 22HD
More information about the scm-commits
mailing list