rpms/xorg-x11-drv-wacom
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Align git snapshot building with other drivers

Browse Source 
- Add autotools/libtool to BuildRequires, we need those when building git
  snapshots
- Always run autoreconf
This commit is contained in:
Peter Hutterer 2012-08-05 11:39:26 +10:00
parent b6153befc7
commit 4a8cf473f2
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xorg-x11-drv-wacom.spec
View File

@ -4,21 +4,24 @@
# Disable gitdate to build from a fixed release # Disable gitdate to build from a fixed release
#global gitdate 20111110 #global gitdate 20111110
#global gitversion 12345689
Summary: Xorg X11 wacom input driver Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom Name: xorg-x11-drv-wacom
Version: 0.16.0 Version: 0.16.0
Release: 4%{?gitdate:.%{gitdate}}%{?dist} Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: GPLv2+ License: GPLv2+
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
%if 0%{?gitdate} %if 0%{?gitdate}
Source0: %{tarball}-%{gitdate}.tar.bz2 Source0: %{tarball}-%{gitdate}.tar.bz2
Source1: make-git-snapshot.sh
Source2: commitid
%else %else
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
%endif %endif
Source1: 70-wacom.rules Source3: 70-wacom.rules
Patch01: 0001-Add-Cintiq-22HD.patch 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-server-sdk >= 1.10.99.902
BuildRequires: xorg-x11-util-macros >= 1.3.0 BuildRequires: xorg-x11-util-macros >= 1.3.0
BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel
BuildRequires: autoconf automake libtool
BuildRequires: systemd-devel BuildRequires: systemd-devel
Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires ansic)
@ -43,10 +47,7 @@ X.Org X11 wacom input driver for Wacom tablets.
%patch01 -p1 %patch01 -p1
%build %build
%if 0%{?gitdate} autoreconf --force -v --install || exit 1
autoreconf -v --install || exit 1
%endif
%configure --disable-static --disable-silent-rules --enable-debug %configure --disable-static --disable-silent-rules --enable-debug
make %{_smp_mflags} make %{_smp_mflags}
@ -60,7 +61,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d 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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -100,6 +101,12 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger %{_bindir}/isdv4-serial-debugger
%changelog %changelog
* Sun Aug 05 2012 Peter Hutterer <peter.hutterer@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@redhat.com> 0.16.0-4 * Sun Aug 05 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.16.0-4
- Add support for Cintiq 22HD - Add support for Cintiq 22HD