Update to latest git master for use with xserver-1.19

- Rebuild against xserver-1.19
This commit is contained in:
Hans de Goede 2016-09-29 19:59:15 +02:00
parent c0135fe3f6
commit 1f14905247
5 changed files with 16 additions and 14 deletions

1
.gitignore vendored
View File

@ -44,3 +44,4 @@ xf86-input-wacom-20101119.tar.bz2
/xf86-input-wacom-0.32.0.tar.bz2 /xf86-input-wacom-0.32.0.tar.bz2
/xf86-input-wacom-0.32.99.1.tar.bz2 /xf86-input-wacom-0.32.99.1.tar.bz2
/xf86-input-wacom-0.33.0.tar.bz2 /xf86-input-wacom-0.33.0.tar.bz2
/xf86-input-wacom-20160929.tar.bz2

1
commitid Normal file
View File

@ -0,0 +1 @@
b61d1711e9a2d6c647341e8ea0119521fd200d62

View File

@ -3,7 +3,8 @@
DIRNAME=xf86-input-wacom-$( date +%Y%m%d ) DIRNAME=xf86-input-wacom-$( date +%Y%m%d )
rm -rf $DIRNAME rm -rf $DIRNAME
git clone git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/xf86-input-wacom $DIRNAME #git clone git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/xf86-input-wacom $DIRNAME
git clone https://github.com/linuxwacom/xf86-input-wacom.git $DIRNAME
cd $DIRNAME cd $DIRNAME
if [ -z "$1" ]; then if [ -z "$1" ]; then
git log | head -1 git log | head -1

View File

@ -1 +1 @@
4faa1d4bf6eb74f40dba8c5cb3c9c3e4 xf86-input-wacom-0.33.0.tar.bz2 0dafa10847dd0d7f7f9b7374f26c6f7d xf86-input-wacom-20160929.tar.bz2

View File

@ -3,13 +3,13 @@
%global driverdir %{moduledir}/input %global driverdir %{moduledir}/input
# Disable gitdate to build from a fixed release # Disable gitdate to build from a fixed release
#global gitdate 20111110 %global gitdate 20160929
#global gitversion 12345689 %global gitversion b61d1711
Summary: Xorg X11 wacom input driver Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom Name: xorg-x11-drv-wacom
Version: 0.33.0 Version: 0.33.0
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 2%{?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
@ -51,20 +51,15 @@ autoreconf --force -v --install || exit 1
make %{_smp_mflags} make %{_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT %make_install
make install DESTDIR=$RPM_BUILD_ROOT
# FIXME: Remove all libtool archives (*.la) from modules directory. This # FIXME: Remove all libtool archives (*.la) from modules directory. This
# should be fixed in upstream Makefile.am or whatever. # should be fixed in upstream Makefile.am or whatever.
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
mv $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/wacom.rules $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/70-wacom.rules mv $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/wacom.rules $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/70-wacom.rules
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%doc AUTHORS README GPL %doc AUTHORS README
%license GPL
%if !0%{?gitdate} %if !0%{?gitdate}
# ChangeLog is autogenerated by make dist, we don't run it from git builds # ChangeLog is autogenerated by make dist, we don't run it from git builds
%doc ChangeLog %doc ChangeLog
@ -89,7 +84,7 @@ Requires: pkgconfig
X.Org X11 wacom input driver development files. X.Org X11 wacom input driver development files.
%files devel %files devel
%doc GPL %license GPL
%{_libdir}/pkgconfig/xorg-wacom.pc %{_libdir}/pkgconfig/xorg-wacom.pc
%{_includedir}/xorg/Xwacom.h %{_includedir}/xorg/Xwacom.h
%{_includedir}/xorg/wacom-properties.h %{_includedir}/xorg/wacom-properties.h
@ -98,6 +93,10 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger %{_bindir}/isdv4-serial-debugger
%changelog %changelog
* Thu Sep 29 2016 Hans de Goede <hdegoede@redhat.com> 0.33.0-2.20160929gitb61d1711
- Update to latest git master for use with xserver-1.19
- Rebuild against xserver-1.19
* Mon May 16 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.33.0-1 * Mon May 16 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.33.0-1
- wacom 0.33.0 - wacom 0.33.0