From c6e749cb61d12ad19e350a2b1f389077e9d424f2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Apr 27 2010 02:48:31 +0000
Subject: - wacom 0.10.6 (from git)


---

diff --git a/.cvsignore b/.cvsignore
index cc80fce..8641c96 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xf86-input-wacom-20100325.tar.bz2
+xf86-input-wacom-20100427.tar.bz2
diff --git a/50-wacom.conf b/50-wacom.conf
deleted file mode 100644
index dd486ee..0000000
--- a/50-wacom.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-Section "InputClass"
-        Identifier "Wacom class"
-        MatchProduct "Wacom|WALTOP|WACOM"
-        Driver "wacom"
-EndSection
-
-Section "InputClass"
-        Identifier "Wacom serial class"
-        MatchProduct "WACf|FUJ02e5|FUJ02e7"
-        Driver "wacom"
-        Option "ForceDevice" "ISDV4"
-EndSection
-
-# N-Trig Duosense Electromagnetic Digitizer
-Section "InputClass"
-        Identifier "Wacom N-Trig class"
-        MatchProduct "HID 1b96:0001"
-        MatchDevicePath "/dev/input/event*"
-        Driver "wacom"
-EndSection
diff --git a/sources b/sources
index 319df36..db2ca19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53edf73453427ecfffbcb2f24d4d89e6  xf86-input-wacom-20100325.tar.bz2
+bd36357f284c058038895a9baa8d08ef  xf86-input-wacom-20100427.tar.bz2
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index bcf74a5..d27bfa5 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -3,12 +3,12 @@
 %global driverdir %{moduledir}/input
 
 # Disable gitdate to build from a fixed release
-%global gitdate 20100325
+%global gitdate 20100427
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.10.5
-Release:    5%{?gitdate:.%{gitdate}}%{?dist}
+Version:    0.10.6
+Release:    1%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -19,7 +19,6 @@ Source0: %{tarball}-%{gitdate}.tar.bz2
 %else
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
 %endif
-Source1: 50-wacom.conf
 
 ExcludeArch: s390 s390x
 
@@ -57,8 +56,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
-install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/X11/xorg.conf.d/
-rm ${RPM_BUILD_ROOT}%{_datadir}/hal/fdi/policy/20thirdparty/wacom.fdi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +89,9 @@ X.Org X11 wacom input driver development files.
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Tue Apr 27 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.6-1.20100427
+- wacom 0.10.6 (from git)
+
 * Thu Apr 15 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.5-5.20100325
 - Fix up missing directory change from last commit.