From 2094246a1c017b74093b59adb3ffc5d65ea106cd Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Tue, 2 Feb 2010 23:47:35 +0000
Subject: [PATCH] - Update sources to sourceforge, 0.10.4 was released on sf
 only. - Remove wacom.fdi, we're just using the one shipped by the driver now.

---
 10-wacom.fdi            | 35 -----------------------------------
 xorg-x11-drv-wacom.spec |  9 ++++++---
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 10-wacom.fdi

diff --git a/10-wacom.fdi b/10-wacom.fdi
deleted file mode 100644
index b6fc310..0000000
--- a/10-wacom.fdi
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- this is probably a bit imprecise -->
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.category" contains="input">
-      <match key="info.product" contains_outof="Wacom;WALTOP">
-	<merge key="input.x11_driver" type="string">wacom</merge>
-      </match>
-    </match>
-    <match key="info.capabilities" contains="serial">
-      <match key="@info.parent:pnp.id" contains_outof="WACf;FUJ02e5">
-	<append key="info.capabilities" type="strlist">input</append>
-	<merge key="input.x11_driver" type="string">wacom</merge>
-	<merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge>
-	<merge key="input.device" type="copy_property">serial.device</merge>
-      </match>
-    </match>
-    <!-- N-Trig Duosense Electromagnetic Digitizer -->
-    <match key="info.product" contains="HID 1b96:0001">
-      <match key="info.parent" contains="if0">
-       <merge key="input.x11_driver" type="string">wacom</merge>
-      </match>
-    </match>
-  </device>
-  <!-- Match the Wacom Bluetooth A5 pen tablet -->
-  <device>
-    <match key="info.capabilities" contains="input.mouse">
-      <match key="info.product" contains="WACOM">
-        <match key="info.product" contains="Tablet">
-          <merge key="input.x11_driver" type="string">wacom</merge>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 62affcb..c51bf00 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -5,14 +5,13 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.4
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://people.freedesktop.org/~whot/%{tarball}/%{tarball}-%{version}.tar.bz2
-Source1: 10-wacom.fdi
+Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-0.10.4.tar.bz2
 
 ExcludeArch: s390 s390x
 
@@ -78,6 +77,10 @@ X.Org X11 wacom input driver development files.
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Wed Feb 03 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-2
+- Update sources to sourceforge, 0.10.4 was released on sf only.
+- Remove wacom.fdi, we're just using the one shipped by the driver now.
+
 * Thu Jan 21 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-1
 - wacom 0.10.4