diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..65ed3e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +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 e69de29..8542cae 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..ef8a3d6 --- /dev/null +++ b/wdaemon.spec @@ -0,0 +1,96 @@ +Name: wdaemon +Version: 0.13 +Release: 2%{?dist} +Summary: Hotplug helper for Wacom X.org driver + +Group: User Interface/X Hardware Support +License: GPL +URL: http://jake.ruivo.org/~aris/wdaemon/ +Source0: http://jake.ruivo.org/~aris/wdaemon/wdaemon-%{version}.tar.bz2 +Patch: wdaemon-0.13-add_missing_entries_to_udev_rules.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} +BuildRequires: glibc-devel +Requires: udev >= 030-21 + +%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 +go away as soon X.org properly supports hotplugging. + +%prep +%setup -q +%patch -p1 + +%build +export CFLAGS="$RPM_OPT_FLAGS" +make + +%install +rm -rf $RPM_BUILD_ROOT + +make DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} sysconfdir=%{_sysconfdir} install; +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/ +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ +install -m 0755 udev/is_uinput.sh $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/ +install -m 0644 udev/61-uinput-wacom.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ +install -m 0644 udev/61-uinput-stddev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +if [ $1 = 1 ]; then + /sbin/chkconfig --add %{name} +fi + +%preun +if [ $1 = 0 ]; then + /sbin/service %{name} stop > /dev/null 2>&1 + /sbin/chkconfig --del %{name} +fi + +%postun +if [ $1 -ge 1 ]; then + /sbin/service %{name} condrestart >/dev/null 2>&1 +fi + +%files +%defattr(-,root,root,-) +%doc AUTHORS LICENSE Changelog README simple.conf +%{_bindir}/wdaemon +%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-wacom.rules +%config(noreplace) %{_sysconfdir}/udev/rules.d/61-uinput-stddev.rules +%{_sysconfdir}/rc.d/init.d/wdaemon +%{_sysconfdir}/udev/scripts/is_uinput.sh + +%changelog +* Wed Feb 06 2008 Aristeu Rozanski 0.13-2 +- adding missing udev entries (Bamboo and Intuos3 4x6") + +* Mon Jan 28 2008 Aristeu Rozanski 0.13-1 +- Updated to version 0.13 + +* Wed Aug 01 2007 Aristeu Rozanski 0.11-1 +- Updated to version 0.11 + +* Tue Jul 24 2007 Aristeu S. Rozanski F. 0.10-3 +- More problems found by Jarod Wilson fixed: +- Removing exclusive architectures, it used to be in sync with linuxwacom + package +- marking udev rules as non-replaceable config files +- using install on makefile + +* Mon Jul 23 2007 Aristeu S. Rozanski F. 0.10-2 +- Fixing the problems found by Jarod Wilson: +- Fixing make install target +- Fixing Makefile so it honors the provided CFLAGS +- not using makeinstall macro +- installing is_uinput.sh as 755 instead of changing later with attr + +* Fri Jul 20 2007 Aristeu S. Rozanski F. 0.10-1 +* upgrading to version 0.10 + +* Thu Jul 19 2007 Aristeu S. Rozanski F. 0.09-1 +- first release +