rpms/xorg-x11-drv-wacom
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add 10-wacom.conf, the fdi file doesn't work anymore.

Browse Source 
- Drop hal requires.
This commit is contained in:
Peter Hutterer 2010-02-17 07:23:07 +00:00
parent 2094246a1c
commit a16c97a572
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
10-wacom.conf Normal file
View File

@ -0,0 +1,19 @@
Section "InputClass"
Identifier "Wacom class"
MatchProduct "Wacom|WALTOP|WACOM"
Driver "wacom"
EndSection
Section "InputClass"
Identifier "Wacom serial class"
MatchProduct "WACf|FUJ02e5|FUJ02e7"
Driver "wacom"
Option "ForceDevice" "ISDV4"
EndSection
# N-Trig Duosense Electromagnetic Digitizer
Section "InputClass"
Identifier "Wacom serial class"
MatchProduct "HID 1b96:0001"
Driver "wacom"
EndSection

16
xorg-x11-drv-wacom.spec
View File

@ -5,13 +5,14 @@
Summary: Xorg X11 wacom input driver Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom Name: xorg-x11-drv-wacom
Version: 0.10.4 Version: 0.10.4
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: GPLv2+ License: GPLv2+
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-0.10.4.tar.bz2 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-0.10.4.tar.bz2
Source1: 10-wacom.conf
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -19,8 +20,7 @@ BuildRequires: xorg-x11-server-sdk >= 1.7.0
BuildRequires: xorg-x11-util-macros >= 1.3.0 BuildRequires: xorg-x11-util-macros >= 1.3.0
BuildRequires: libX11-devel libXi-devel BuildRequires: libX11-devel libXi-devel
Requires: xorg-x11-server-Xorg >= 1.7.0 Requires: xorg-x11-server-Xorg >= 1.7.99
Requires: hal
Requires: libX11 libXi Requires: libX11 libXi
Provides: linuxwacom = %{version}-%{release} Provides: linuxwacom = %{version}-%{release}
@ -45,8 +45,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
# should be fixed in upstream Makefile.am or whatever. # should be fixed in upstream Makefile.am or whatever.
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty install -d $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
install -m 0644 ${RPM_BUILD_ROOT}%{_datadir}/hal/fdi/policy/20thirdparty/wacom.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/10-wacom.fdi install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/xorg.conf.d/
rm ${RPM_BUILD_ROOT}%{_datadir}/hal/fdi/policy/20thirdparty/wacom.fdi rm ${RPM_BUILD_ROOT}%{_datadir}/hal/fdi/policy/20thirdparty/wacom.fdi
%clean %clean
@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog README GPL %doc AUTHORS ChangeLog README GPL
%{driverdir}/wacom_drv.so %{driverdir}/wacom_drv.so
%{_mandir}/man4/wacom.4* %{_mandir}/man4/wacom.4*
%{_datadir}/hal/fdi/policy/20thirdparty/10-wacom.fdi %{_sysconfdir}/xorg.conf.d/10-wacom.conf
%{_bindir}/xsetwacom %{_bindir}/xsetwacom
%package devel %package devel
@ -77,6 +77,10 @@ X.Org X11 wacom input driver development files.
%{_includedir}/xorg/wacom-properties.h %{_includedir}/xorg/wacom-properties.h
%changelog %changelog
* Wed Feb 17 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-3
- Add 10-wacom.conf, the fdi file doesn't work anymore.
- Drop hal requires.
* Wed Feb 03 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-2 * Wed Feb 03 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-2
- Update sources to sourceforge, 0.10.4 was released on sf only. - Update sources to sourceforge, 0.10.4 was released on sf only.
- Remove wacom.fdi, we're just using the one shipped by the driver now. - Remove wacom.fdi, we're just using the one shipped by the driver now.