rpms/xorg-x11-drv-wacom/F-13 wacom-0.10.4-xsetwacom-display.patch, NONE, 1.1 xorg-x11-drv-wacom.spec, 1.12, 1.13

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6348

Modified Files:
	xorg-x11-drv-wacom.spec 
Added Files:
	wacom-0.10.4-xsetwacom-display.patch 
Log Message:
* Tue Mar 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.4-6
- wacom-0.10.4-xsetwacom-display.patch: fix option parsing for xsetwacom
  --display (Related #561835 cmd #26)


wacom-0.10.4-xsetwacom-display.patch:
 xsetwacom.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE wacom-0.10.4-xsetwacom-display.patch ---
>From c17f3ad534b9650e22849ef768538fef1ec8400b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 16 Mar 2010 14:16:09 +1000
Subject: [PATCH] xsetwacom: fix wrong option parsing for --display.

Reported-by: Andrew Lofthouse
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 tools/xsetwacom.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index 4076722..380c05e 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -1967,7 +1967,7 @@ int main (int argc, char **argv)
 		{"help", 0, NULL, 0},
 		{"verbose", 0, NULL, 0},
 		{"version", 0, NULL, 0},
-		{"display", 1, (int*)display, 0},
+		{"display", 1, NULL, 'd'},
 		{"shell", 0, NULL, 0},
 		{"xconf", 0, NULL, 0},
 		{"list", 0, NULL, 0},
-- 
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.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xorg-x11-drv-wacom.spec	4 Mar 2010 00:16:32 -0000	1.12
+++ xorg-x11-drv-wacom.spec	16 Mar 2010 04:48:52 -0000	1.13
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.4
-Release:    5%{?dist}
+Release:    6%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-0.10.4.tar.bz2
 Source1: 10-wacom.conf
 
+Patch1: wacom-0.10.4-xsetwacom-display.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.7.0
@@ -31,6 +33,7 @@ X.Org X11 wacom input driver for Wacom t
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -80,6 +83,10 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Tue Mar 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.4-6
+- wacom-0.10.4-xsetwacom-display.patch: fix option parsing for xsetwacom
+  --display (Related #561835 cmd #26)
+
 * Thu Mar 04 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.4-5
 - Fix 10-wacom.conf for N-Trig devices: rename the class (copy/paste error)
   and only take event devices. (Related #526270)