diff --git a/.cvsignore b/.gitignore similarity index 66% rename from .cvsignore rename to .gitignore index 27b7b0b..478fb49 100644 --- a/.cvsignore +++ b/.gitignore @@ -1,2 +1,3 @@ wdaemon-0.11.tar.bz2 wdaemon-0.12.tar.bz2 +wdaemon-0.13.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 029ac21..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wdaemon -# $Id$ -NAME := wdaemon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index eb739b2..8542cae 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ccf216d77a096613aa7ddc9da7976102 wdaemon-0.11.tar.bz2 -3ca0ff8aad51a12a6deb1fe0734da33c wdaemon-0.12.tar.bz2 +4061282edd35cc80291323c4225e4e93 wdaemon-0.13.tar.bz2 diff --git a/wdaemon-0.13-add_missing_entries_to_udev_rules.patch b/wdaemon-0.13-add_missing_entries_to_udev_rules.patch new file mode 100644 index 0000000..c66d95b --- /dev/null +++ b/wdaemon-0.13-add_missing_entries_to_udev_rules.patch @@ -0,0 +1,27 @@ +--- + udev/60-wacom.rules | 4 +++- + udev/61-uinput-wacom.rules | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +--- wdaemon-0.13.orig/udev/60-wacom.rules 2008-01-28 16:51:12.000000000 -0500 ++++ wdaemon-0.13/udev/60-wacom.rules 2008-01-28 16:53:22.000000000 -0500 +@@ -47,5 +47,7 @@ SUBSYSTEM=="usb", KERNEL=="event*", ATTR + SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b4", SYMLINK+="input/wacom-tablets/intuos3-12x19 input/wacom-tablets/intuos3-12x19-%b" + SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b5", SYMLINK+="input/wacom-tablets/intuos3-6x11 input/wacom-tablets/intuos3-6x11-%b" + SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="003f", SYMLINK+="input/wacom-tablets/cintiq21ux input/wacom-tablets/cintiq21ux-%b" +-SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8a input/wacom-tablets/intuos2-6x8a-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8 input/wacom-tablets/intuos2-6x8-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b7", SYMLINK+="input/wacom-tablets/intuos3-4x6 input/wacom-tablets/intuos3-4x6-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0065", SYMLINK+="input/wacom-tablets/bamboo input/wacom-tablets/bamboo-%b" + +--- wdaemon-0.13.orig/udev/61-uinput-wacom.rules 2007-07-20 11:47:16.000000000 -0400 ++++ wdaemon-0.13/udev/61-uinput-wacom.rules 2008-01-28 16:53:22.000000000 -0500 +@@ -44,5 +44,7 @@ KERNEL=="event*", PROGRAM=="/etc/udev/sc + KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-00b4", SYMLINK+="input/uinput-devices/uinput-wacom-intuos3-12x19-tablet" + KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-00b5", SYMLINK+="input/uinput-devices/uinput-wacom-intuos3-6x11-tablet" + KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-003f", SYMLINK+="input/uinput-devices/uinput-wacom-cintiq21ux-tablet" +-KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-0047", SYMLINK+="input/uinput-devices/uinput-wacom-intuos2-6x8a-tablet" ++KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-0047", SYMLINK+="input/uinput-devices/uinput-wacom-intuos2-6x8-tablet" ++KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-00b7", SYMLINK+="input/uinput-devices/uinput-wacom-intuos3-4x6-tablet" ++KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-0065", SYMLINK+="input/uinput-devices/uinput-wacom-bamboo-tablet" + diff --git a/wdaemon.spec b/wdaemon.spec index e633709..59e2553 100644 --- a/wdaemon.spec +++ b/wdaemon.spec @@ -1,6 +1,6 @@ Name: wdaemon -Version: 0.12 -Release: 1%{?dist} +Version: 0.13 +Release: 3%{?dist} Summary: Hotplug helper for Wacom X.org driver Group: User Interface/X Hardware Support @@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: glibc-devel Requires: udev >= 030-21 +Patch: wdaemon-0.13-add_missing_entries_to_udev_rules.patch + %description Helper application which emulates persistent input devices for Wacom tablets so they can be plugged and unplugged while X.org server is running. This should @@ -19,6 +21,7 @@ go away as soon X.org properly supports hotplugging. %prep %setup -q +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -63,6 +66,15 @@ fi %{_sysconfdir}/udev/scripts/is_uinput.sh %changelog +* Mon Jan 28 2008 Aristeu Rozanski 0.13-3 +- adding missing entries (Bamboo, Intuos3 4x6") on uinput udev rules + +* Mon Jan 28 2008 Aristeu Rozanski 0.13-2 +- adding missing entries (Bamboo, Intuos3 4x6") on udev rules + +* Mon Jan 28 2008 Aristeu Rozanski 0.13-1 +- Updated to version 0.13 + * Wed Sep 19 2007 Aristeu Rozanski 0.12-1 - Updated to version 0.12