From b8a1dd1d88e2fc53590853d18914fa08248fac0b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 29 Aug 2007 19:59:57 +0000 Subject: [PATCH 1/6] Initialize branch F-7 for wdaemon --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 14e2d8fb44d590278a017a005456d0b0b0e4a601 Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Tue, 11 Sep 2007 12:48:00 +0000 Subject: [PATCH 2/6] 0.11-1 --- .cvsignore | 1 + sources | 1 + wdaemon.spec | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 wdaemon.spec diff --git a/.cvsignore b/.cvsignore index e69de29..4dc9f8b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wdaemon-0.11.tar.bz2 diff --git a/sources b/sources index e69de29..83aa4f1 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ccf216d77a096613aa7ddc9da7976102 wdaemon-0.11.tar.bz2 diff --git a/wdaemon.spec b/wdaemon.spec new file mode 100644 index 0000000..08c8469 --- /dev/null +++ b/wdaemon.spec @@ -0,0 +1,88 @@ +Name: wdaemon +Version: 0.11 +Release: 1%{?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 + +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 + +%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 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 + From 09f5c896645d2414b811e5678dee7405ec908e54 Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Mon, 28 Jan 2008 20:45:10 +0000 Subject: [PATCH 3/6] updating to version 0.13 --- .cvsignore | 2 +- sources | 2 +- wdaemon.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4dc9f8b..65ed3e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wdaemon-0.11.tar.bz2 +wdaemon-0.13.tar.bz2 diff --git a/sources b/sources index 83aa4f1..8542cae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ccf216d77a096613aa7ddc9da7976102 wdaemon-0.11.tar.bz2 +4061282edd35cc80291323c4225e4e93 wdaemon-0.13.tar.bz2 diff --git a/wdaemon.spec b/wdaemon.spec index 08c8469..d9e0f71 100644 --- a/wdaemon.spec +++ b/wdaemon.spec @@ -1,5 +1,5 @@ Name: wdaemon -Version: 0.11 +Version: 0.13 Release: 1%{?dist} Summary: Hotplug helper for Wacom X.org driver @@ -63,6 +63,9 @@ fi %{_sysconfdir}/udev/scripts/is_uinput.sh %changelog +* 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 From cece81f546247f5507adf58be5337a5eed111119 Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Wed, 6 Feb 2008 20:48:59 +0000 Subject: [PATCH 4/6] adding missing entries on udev rules for Bamboo and Intuos3 4x6" --- ...13-add_missing_entries_to_udev_rules.patch | 27 +++++++++++++++++++ wdaemon.spec | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 wdaemon-0.13-add_missing_entries_to_udev_rules.patch 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 d9e0f71..ef8a3d6 100644 --- a/wdaemon.spec +++ b/wdaemon.spec @@ -1,12 +1,13 @@ Name: wdaemon Version: 0.13 -Release: 1%{?dist} +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 @@ -19,6 +20,7 @@ go away as soon X.org properly supports hotplugging. %prep %setup -q +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -63,6 +65,9 @@ fi %{_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 From cfe36ea2268c39d27dc63d0dd2f0d3d66c161f19 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:45 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 029ac21..ca5ba3c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From af5d469ca1c122363e946c870414ea4a9790a2a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:13:49 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ca5ba3c..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 $$d/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/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7