[xorg-x11-drv-wacom] wacom 0.23.99.1

[Peter Hutterer]

commit 218c931df5d9c7a719065c3dd925735162241867
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 21 10:17:08 2014 +1000

    wacom 0.23.99.1

 .gitignore                                         |    1 +
 ...dd-N-Trig-DuoSense-to-our-matched-devices.patch |   47 -
 ...oth-clients-and-drivers-need-the-protocol.patch |   34 -
 0002-Include-stdint-from-isdv4.h.patch             |   28 -
 ...-isdv4-inline-all-isdv4-parsing-functions.patch |   63 --
 0004-tools-rearrange-serial-settings.patch         |  121 ---
 0005-tools-open-serial-devices-with-O_NOCTTY.patch |   29 -
 0006-tools-use-perror-instead-of-fprintf.patch     |   26 -
 0007-tools-drop-double-call-to-tcsetattr.patch     |   27 -
 0008-tools-drop-global-packagelen.patch            |   35 -
 0009-tools-drop-leftover-global-variables.patch    |   91 --
 0010-tools-make-event_loop-static.patch            |   26 -
 ...-out-the-debugger-into-the-actual-debugge.patch | 1043 --------------------
 0012-tools-re-enable-wait-for-tablet.patch         |   41 -
 0013-tools-add-colon-after-TOUCH-output.patch      |   36 -
 0014-tools-add-an-inputattach-like-tool.patch      |  264 -----
 70-wacom.rules                                     |   15 -
 sources                                            |    2 +-
 wacom-inputattach at .service                         |    7 -
 xorg-x11-drv-wacom.spec                            |   51 +-
 20 files changed, 12 insertions(+), 1975 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87902f6..69163f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ xf86-input-wacom-20101119.tar.bz2
 /xf86-input-wacom-0.21.99.1.tar.bz2
 /xf86-input-wacom-0.22.0.tar.bz2
 /xf86-input-wacom-0.23.0.tar.bz2
+/xf86-input-wacom-0.23.99.1.tar.bz2
diff --git a/sources b/sources
index a9b6d4e..fe1d12c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-353642b8a3f2dde089e913be32955aae  xf86-input-wacom-0.23.0.tar.bz2
+420e7fc2a00126eced2561aeaf057b13  xf86-input-wacom-0.23.99.1.tar.bz2
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 1e034a4..be4bee9 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -8,8 +8,8 @@
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.23.0
-Release:    11%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:    0.23.99.1
+Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -21,24 +21,6 @@ Source2: commitid
 %else
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
 %endif
-Source3: 70-wacom.rules
-Source4: wacom-inputattach at .service
-
-Patch00: 0001-conf-add-N-Trig-DuoSense-to-our-matched-devices.patch
-Patch01: 0001-configure-both-clients-and-drivers-need-the-protocol.patch
-Patch02: 0002-Include-stdint-from-isdv4.h.patch
-Patch03: 0003-isdv4-inline-all-isdv4-parsing-functions.patch
-Patch04: 0004-tools-rearrange-serial-settings.patch
-Patch05: 0005-tools-open-serial-devices-with-O_NOCTTY.patch
-Patch06: 0006-tools-use-perror-instead-of-fprintf.patch
-Patch07: 0007-tools-drop-double-call-to-tcsetattr.patch
-Patch08: 0008-tools-drop-global-packagelen.patch
-Patch09: 0009-tools-drop-leftover-global-variables.patch
-Patch10: 0010-tools-make-event_loop-static.patch
-Patch11: 0011-tools-split-out-the-debugger-into-the-actual-debugge.patch
-Patch12: 0012-tools-re-enable-wait-for-tablet.patch
-Patch13: 0013-tools-add-colon-after-TOUCH-output.patch
-Patch14: 0014-tools-add-an-inputattach-like-tool.patch
 
 ExcludeArch: s390 s390x
 
@@ -59,25 +41,13 @@ X.Org X11 wacom input driver for Wacom tablets.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch00 -p1
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
 
 %build
 autoreconf --force -v --install || exit 1
-%configure --disable-static --disable-silent-rules --enable-debug
+%configure --disable-static --disable-silent-rules --enable-debug \
+           --with-systemd-unit-dir=%{_unitdir} \
+           --with-udev-rules-dir=%{_prefix}/lib/udev/rules.d/
+
 make %{_smp_mflags}
 
 %install
@@ -88,11 +58,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
-
-install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules
-install -d $RPM_BUILD_ROOT%{_unitdir}
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/wacom-inputattach at .service
+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
@@ -134,6 +100,9 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Fri Mar 21 2014 Peter Hutterer <peter.hutterer at redhat.com> - 0.23.99.1-2
+- wacom 0.23.99.1
+
 * Wed Mar 19 2014 Peter Hutterer <peter.hutterer at redhat.com> 0.23.0-11
 - Use custom wacom inputattach tool (#1046912)