Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Fri Jul 25 17:05:57 CEST 2008.
--------
--- x11-input-wacom/x11-input-wacom.changes 2008-07-24 17:40:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2008-07-25 14:47:32.451905073 +0200
@@ -1,0 +2,12 @@
+Fri Jul 25 14:47:01 CEST 2008 - sndirsch@suse.de
+
+- linuxwacom-fix-wacomcpl-calibration.diff
+ * fix wacomcpl calibration (bnc #412182)
+
+-------------------------------------------------------------------
+Fri Jul 25 09:49:06 CEST 2008 - sndirsch@suse.de
+
+- linuxwacom-fix-multitouch.diff no longer required
+- specfile cleanup
+
+-------------------------------------------------------------------
Old:
----
linuxwacom-fix-multitouch.diff
s390.diff
xorg-server-1.5.diff
New:
----
linuxwacom-fix-wacomcpl-calibration.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.W25286/_old 2008-07-25 17:05:36.000000000 +0200
+++ /var/tmp/diff_new_pack.W25286/_new 2008-07-25 17:05:36.000000000 +0200
@@ -14,22 +14,19 @@
Name: x11-input-wacom
BuildRequires: gtk2-devel ncurses ncurses-devel tk-devel update-desktop-files
-%ifnarch s390 s390x
BuildRequires: xorg-x11-driver-input xorg-x11-server-sdk
-%endif
+ExcludeArch: s390 s390x
License: GPL v2 or later
Url: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
Version: 0.8.1
-Release: 1
+Release: 2
Summary: X11 input module for wacom tablet
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o
Source: linuxwacom-%{version}-%{revision}.tar.bz2
Source1: 65-wacom.rules
-Patch: linuxwacom-fix-multitouch.diff
+Patch: linuxwacom-fix-wacomcpl-calibration.diff
Patch1: linuxwacom-fix-xsetwacom_find_devices.diff
-Patch2: s390.diff
-Patch3: xorg-server-1.5.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -41,8 +38,6 @@
--------
Ping Cheng
-%ifnarch s390 s390x
-
%package tools
License: GPL v2 or later
Summary: Tools for configuration, diagnostic and libraries for Wacom tablets
@@ -81,43 +76,24 @@
--------
Ping Cheng
-%endif
-
%prep
%setup -n linuxwacom-%{version}-%{revision}
-%patch
+%patch -p1
%patch1
-%ifarch s390 s390x
-%patch2
-%endif
-%patch3
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
libtoolize --force
autoreconf --force --install
-%ifarch s390 s390x
-%configure --prefix=/usr \
- --disable-libwacomcfg \
- --disable-xsetwacom \
- --disable-wacdump \
- --disable-xidump \
- --disable-libwacomxi
-%else
%configure --prefix=/usr \
-%ifarch x86_64
- --enable-xserver64 \
-%endif
--enable-wacdump \
--enable-dlloader \
--with-xmoduledir=/usr/%{_lib}/xorg/modules/input \
--with-xlib=/usr/%{_lib}
-%endif
make
%install
make install DESTDIR=$RPM_BUILD_ROOT
-%ifnarch s390 s390x
# Script libraries for Tcl extensions should be in a package-specific
# subdir of /usr/share/tcl
mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/%{name}-tools
@@ -130,7 +106,6 @@
mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
install -m 644 $RPM_SOURCE_DIR/65-wacom.rules \
$RPM_BUILD_ROOT/etc/udev/rules.d
-%endif
%clean
rm -rf %{buildroot}
@@ -142,7 +117,6 @@
%files
%defattr(-,root,root)
%doc AUTHORS GPL README
-%ifnarch s390 s390x
%dir /usr/%_lib/xorg
%dir /usr/%_lib/xorg/modules/
%dir /usr/%_lib/xorg/modules/input
@@ -150,9 +124,7 @@
%dir /etc/udev/rules.d
/etc/udev/rules.d/65-wacom.rules
%attr (644,root,root) /usr/%_lib/xorg/modules/input/wacom_drv.so
-%endif
%{_mandir}/man4/wacom.4x.gz
-%ifnarch s390 s390x
%files tools
%defattr(-,root,root)
@@ -177,9 +149,14 @@
/usr/%_lib/libwacomcfg.a
/usr/%_lib/libwacomcfg.la
/usr/%_lib/libwacomcfg.so
-%endif
%changelog
+* Fri Jul 25 2008 sndirsch@suse.de
+- linuxwacom-fix-wacomcpl-calibration.diff
+ * fix wacomcpl calibration (bnc #412182)
+* Fri Jul 25 2008 sndirsch@suse.de
+- linuxwacom-fix-multitouch.diff no longer required
+- specfile cleanup
* Thu Jul 24 2008 sndirsch@suse.de
- updated to 0.8.1-1 due to rotation working again with this
version
++++++ linuxwacom-fix-wacomcpl-calibration.diff ++++++
From: Danny Kukawka
Subject: Fix wacomcpl device detection for calibration
This patch fixes the detection of the wacom input devices in wacomcpl.
Currently they get always detected as core devices which prevents calibration.
Signed-off-by: Danny Kukawka
---
wacomxi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linuxwacom-0.8.1/src/wacomxi/wacomxi.c 2008-07-25 13:52:12.000000000 +0200
+++ linuxwacom-0.8.1/src/wacomxi/wacomxi.c 2008-07-25 13:52:27.000000000 +0200
@@ -126,7 +126,7 @@
device->xdev = NULL;
device->id = device_list[i].id;
device->name = Tk_GetUid(device_list[i].name);
- device->core = ((device_list[i].use == IsXExtensionDevice) ? 0 :
+ device->core = ((device_list[i].use >= IsXExtensionDevice) ? 0 :
((device_list[i].use == IsXPointer) ? CORE_POINTER : CORE_KEYBOARD));
device->x_index = 0;
device->y_index = 1;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org