Hello community, here is the log from the commit of package x11-input-wacom checked in at Mon Jun 30 19:47:11 CEST 2008. -------- --- x11-input-wacom/x11-input-wacom.changes 2008-06-10 21:10:49.000000000 +0200 +++ x11-input-wacom/x11-input-wacom.changes 2008-06-30 12:54:20.509526000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 30 11:56:33 CEST 2008 - sndirsch@suse.de + +- added udev rule for creating /dev/input/wacom symlink (bnc #404847) +- fixed build on s390(x) + +------------------------------------------------------------------- New: ---- 65-wacom.rules s390.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.W23548/_old 2008-06-30 19:46:41.000000000 +0200 +++ /var/tmp/diff_new_pack.W23548/_new 2008-06-30 19:46:41.000000000 +0200 @@ -21,16 +21,18 @@ Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.7.9 -Release: 52 +Release: 54 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 Patch0: linuxwacom-0.7.8-3.diff Patch1: linuxwacom-autoprobe.diff Patch2: linuxwacom-0.7.9-1.diff Patch3: linuxwacom-fix-multitouch.diff Patch4: linuxwacom-debug.diff Patch5: linuxwacom-fix-xsetwacom_find_devices.diff +Patch6: s390.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,6 +44,8 @@ -------- Ping Cheng <pingc@wacom.com> +%ifnarch s390 s390x + %package tools License: GPL v2 or later Summary: Tools for configuration, diagnostic and libraries for Wacom tablets @@ -80,6 +84,8 @@ -------- Ping Cheng <pingc@wacom.com> +%endif + %prep %setup -n linuxwacom-%{version}-%{revision} %patch0 @@ -88,13 +94,21 @@ %patch3 %patch4 -p1 %patch5 +%ifarch s390 s390x +%patch6 +%endif %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" libtoolize --force autoreconf --force --install %ifarch s390 s390x -./configure --prefix=/usr +./configure --prefix=/usr \ + --disable-libwacomcfg \ + --disable-xsetwacom \ + --disable-wacdump \ + --disable-xidump \ + --disable-libwacomxi %else ./configure --prefix=/usr \ %ifarch x86_64 @@ -109,6 +123,7 @@ %install make install DESTDIR=$RPM_BUILD_ROOT +%ifnarch s390 s390x if [ "%_lib" == "lib64" ]; then mkdir -p $RPM_BUILD_ROOT/usr/lib64 mv $RPM_BUILD_ROOT/usr/lib/libwacomcfg.* $RPM_BUILD_ROOT/usr/lib64/ @@ -122,10 +137,19 @@ # workaround for Bug #118793 ln -snf /usr/%{_lib}/TkXInput/libwacomxi.so \ $RPM_BUILD_ROOT/usr/share/tcl/x11-input-wacom-tools/libwacomxi.so +# udev rule for creating /dev/input/wacom symlink (Bug #404847) +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} +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc AUTHORS GPL README @@ -133,9 +157,13 @@ %dir /usr/%_lib/xorg %dir /usr/%_lib/xorg/modules/ %dir /usr/%_lib/xorg/modules/input +%dir /etc/udev +%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) @@ -160,8 +188,12 @@ /usr/%_lib/libwacomcfg.a /usr/%_lib/libwacomcfg.la /usr/%_lib/libwacomcfg.so +%endif %changelog +* Mon Jun 30 2008 sndirsch@suse.de +- added udev rule for creating /dev/input/wacom symlink (bnc #404847) +- fixed build on s390(x) * Tue Jun 10 2008 sndirsch@suse.de - fixed linuxwacom-fix-xsetwacom_find_devices.diff (bnc #399016) * Sat May 17 2008 sndirsch@suse.de ++++++ s390.diff ++++++ --- src/Makefile.am.orig 2008-06-30 10:50:19.133574906 +0000 +++ src/Makefile.am 2008-06-30 10:50:37.013562777 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = . wacomxi util xdrv @WCM_KERNEL_VER@ +SUBDIRS = . wacomxi xdrv @WCM_KERNEL_VER@ wmanpagedir = /usr/share/man/man4 wmanpage_HEADERS = wacom.4x.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de