rpms/xorg-x11-drv-wacom/F-13 wacom-0.10.6-serial-identifiers.patch, NONE, 1.1 xorg-x11-drv-wacom.spec, 1.15, 1.16 50-wacom.conf, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9446

Modified Files:
	xorg-x11-drv-wacom.spec 
Added Files:
	wacom-0.10.6-serial-identifiers.patch 
Removed Files:
	50-wacom.conf 
Log Message:
* Tue Apr 27 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-1
- wacom 0.10.6 
- wacom-0.10.6-serial-identifiers.patch: add some more serial IDs to the
  config file.


wacom-0.10.6-serial-identifiers.patch:
 50-wacom.conf |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE wacom-0.10.6-serial-identifiers.patch ---
>From a9746a469b522dded6828851617b3f3ee8c1bf89 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 27 Apr 2010 13:51:17 +1000
Subject: [PATCH] conf: add WACf, FUJ02e5 and FUJ02e7 to serial identifers.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 conf/50-wacom.conf |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
index e1869e9..9a02b0e 100644
--- a/conf/50-wacom.conf
+++ b/conf/50-wacom.conf
@@ -15,6 +15,14 @@ Section "InputClass"
 	Option "ForceDevice" "ISDV4"
 EndSection
 
+Section "InputClass"
+        Identifier "Wacom serial class identifiers"
+        MatchProduct "WACf|FUJ02e5|FUJ02e7"
+        Driver "wacom"
+        Option "ForceDevice" "ISDV4"
+EndSection
+
+
 # N-Trig Duosense Electromagnetic Digitizer
 Section "InputClass"
 	Identifier "Wacom N-Trig class"
-- 
1.6.6.1



Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-13/xorg-x11-drv-wacom.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xorg-x11-drv-wacom.spec	15 Apr 2010 05:33:22 -0000	1.15
+++ xorg-x11-drv-wacom.spec	27 Apr 2010 04:00:42 -0000	1.16
@@ -4,15 +4,16 @@
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.10.5
-Release:    2%{?dist}
+Version:    0.10.6
+Release:    1%{?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://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
-Source1: 50-wacom.conf
+
+Patch01:  wacom-0.10.6-serial-identifiers.patch
 
 ExcludeArch: s390 s390x
 
@@ -32,6 +33,8 @@ X.Org X11 wacom input driver for Wacom t
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch01 -p1
+
 %build
 %configure --disable-static
 make %{_smp_mflags}
@@ -46,8 +49,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
@@ -80,6 +81,12 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Tue Apr 27 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-1
+- wacom 0.10.6 
+- wacom-0.10.6-serial-identifiers.patch: add some more serial IDs to the
+  config file.
+
+
 * Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.5-2
 - Install config snippet in $datadir/X11/xorg.conf.d
 - rename to 50-wacom.conf to match upstream naming.


--- 50-wacom.conf DELETED ---