rpms/xorg-x11-drv-wacom/F-13 10-wacom.conf, NONE, 1.1 xorg-x11-drv-wacom.spec, 1.9, 1.10
Peter Hutterer
whot at fedoraproject.org
Wed Feb 17 07:35:03 UTC 2010
- Previous message: rpms/xorg-x11-drv-wacom/devel 10-wacom.conf, NONE, 1.1 xorg-x11-drv-wacom.spec, 1.9, 1.10
- Next message: comps comps-f11.xml.in, 1.358, 1.359 comps-f12.xml.in, 1.225, 1.226 comps-f13.xml.in, 1.168, 1.169 comps-f14.xml.in, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1787
Modified Files:
xorg-x11-drv-wacom.spec
Added Files:
10-wacom.conf
Log Message:
* Wed Feb 17 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.4-3
- Add 10-wacom.conf, the fdi file doesn't work anymore.
- Drop hal requires.
--- NEW FILE 10-wacom.conf ---
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
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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xorg-x11-drv-wacom.spec 2 Feb 2010 23:47:35 -0000 1.9
+++ xorg-x11-drv-wacom.spec 17 Feb 2010 07:35:02 -0000 1.10
@@ -5,13 +5,14 @@
Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom
Version: 0.10.4
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.x.org
License: GPLv2+
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-0.10.4.tar.bz2
+Source1: 10-wacom.conf
ExcludeArch: s390 s390x
@@ -19,8 +20,7 @@ BuildRequires: xorg-x11-server-sdk >= 1.
BuildRequires: xorg-x11-util-macros >= 1.3.0
BuildRequires: libX11-devel libXi-devel
-Requires: xorg-x11-server-Xorg >= 1.7.0
-Requires: hal
+Requires: xorg-x11-server-Xorg >= 1.7.99
Requires: libX11 libXi
Provides: linuxwacom = %{version}-%{release}
@@ -45,8 +45,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
# should be fixed in upstream Makefile.am or whatever.
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
-install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-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 -d $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/xorg.conf.d/
rm ${RPM_BUILD_ROOT}%{_datadir}/hal/fdi/policy/20thirdparty/wacom.fdi
%clean
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog README GPL
%{driverdir}/wacom_drv.so
%{_mandir}/man4/wacom.4*
-%{_datadir}/hal/fdi/policy/20thirdparty/10-wacom.fdi
+%{_sysconfdir}/xorg.conf.d/10-wacom.conf
%{_bindir}/xsetwacom
%package devel
@@ -77,6 +77,10 @@ X.Org X11 wacom input driver development
%{_includedir}/xorg/wacom-properties.h
%changelog
+* Wed Feb 17 2010 Peter Hutterer <peter.hutterer at 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 at redhat.com> 0.10.4-2
- 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.
- Previous message: rpms/xorg-x11-drv-wacom/devel 10-wacom.conf, NONE, 1.1 xorg-x11-drv-wacom.spec, 1.9, 1.10
- Next message: comps comps-f11.xml.in, 1.358, 1.359 comps-f12.xml.in, 1.225, 1.226 comps-f13.xml.in, 1.168, 1.169 comps-f14.xml.in, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list