rpms/xorg-x11-drv-wacom/F-12 10-wacom.fdi, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xorg-x11-drv-wacom.spec, 1.1, 1.2

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4053

Modified Files:
	.cvsignore sources xorg-x11-drv-wacom.spec 
Added Files:
	10-wacom.fdi 
Log Message:
* Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-1
- wacom 0.10.1
- Remove unnecessary 'find' directive, changed upstream.
- Add GPL document
- Install 10-wacom.fdi file.
- Provides: linuxwacom



--- NEW FILE 10-wacom.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- this is probably a bit imprecise -->
<deviceinfo version="0.2">
  <device>
    <match key="info.category" contains="input">
      <match key="info.product" contains_outof="Wacom;WALTOP">
	<merge key="input.x11_driver" type="string">wacom</merge>
      </match>
    </match>
    <match key="info.capabilities" contains="serial">
      <match key="@info.parent:pnp.id" contains_outof="WACf;FUJ02e5">
	<append key="info.capabilities" type="strlist">input</append>
	<merge key="input.x11_driver" type="string">wacom</merge>
	<merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge>
	<merge key="input.device" type="copy_property">serial.device</merge>
      </match>
    </match>
    <!-- N-Trig Duosense Electromagnetic Digitizer -->
    <match key="info.product" contains="HID 1b96:0001">
      <match key="info.parent" contains="if0">
       <merge key="input.x11_driver" type="string">wacom</merge>
      </match>
    </match>
  </device>
  <!-- Match the Wacom Bluetooth A5 pen tablet -->
  <device>
    <match key="info.capabilities" contains="input.mouse">
      <match key="info.product" contains="WACOM">
        <match key="info.product" contains="Tablet">
          <merge key="input.x11_driver" type="string">wacom</merge>
        </match>
      </match>
    </match>
  </device>
</deviceinfo>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Nov 2009 00:04:38 -0000	1.2
+++ .cvsignore	20 Nov 2009 04:46:42 -0000	1.3
@@ -1 +1 @@
-xf86-input-wacom-0.10.0.tar.bz2
+xf86-input-wacom-0.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Nov 2009 00:04:38 -0000	1.2
+++ sources	20 Nov 2009 04:46:42 -0000	1.3
@@ -1 +1 @@
-91af5fab1637c6ce52e3f9418d53e22b  xf86-input-wacom-0.10.0.tar.bz2
+544f40bb5bcdd8538c248c4067f3848f  xf86-input-wacom-0.10.1.tar.bz2


Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xorg-x11-drv-wacom.spec	20 Nov 2009 00:04:38 -0000	1.1
+++ xorg-x11-drv-wacom.spec	20 Nov 2009 04:46:42 -0000	1.2
@@ -4,14 +4,15 @@
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
-Version:    0.10.0
-Release:    4%{?dist}
+Version:    0.10.1
+Release:    1%{?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://people.freedesktop.org/~whot/%{tarball}/%{tarball}-%{version}.tar.bz2
+Source1: 10-wacom.fdi
 
 ExcludeArch: s390 s390x
 
@@ -19,7 +20,9 @@ BuildRequires: xorg-x11-server-sdk >= 1.
 BuildRequires: xorg-x11-util-macros >= 1.3.0
 
 Requires:  xorg-x11-server-Xorg >= 1.7.0
+Requires:  hal
 
+Provides:  linuxwacom = %{version}-%{release}
 Obsoletes: linuxwacom <= 0.8.4.3
 
 %description
@@ -27,7 +30,6 @@ X.Org X11 wacom input driver for Wacom t
 
 %prep
 %setup -q -n %{tarball}-%{version}
-find -type f -name '*.[ch]' | xargs chmod -x
 
 %build
 %configure --disable-static
@@ -42,14 +44,18 @@ 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 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog README GPL
 %{driverdir}/wacom_drv.so
 %{_mandir}/man4/wacom.4*
+%{_datadir}/hal/fdi/policy/20thirdparty/10-wacom.fdi
 
 
 %package devel
@@ -66,9 +72,16 @@ X.Org X11 wacom input driver development
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/xorg-wacom.pc
 %{_includedir}/xorg/Xwacom.h
-
+%{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-1
+- wacom 0.10.1
+- Remove unnecessary 'find' directive, changed upstream.
+- Add GPL document
+- Install 10-wacom.fdi file.
+- Provides: linuxwacom
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.0-4
 - BuildRequires xorg-x11-util-macros 1.3.0