[packages/linuxwacom] - up to 0.12.0 - use upstream rules (when building with xorg driver, disabled by default - exists as

Fri Dec 1 21:46:24 CET 2017

commit 429ae2a2668616f8f179cf9fd911ffd087e2e203
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 1 21:47:31 2017 +0100

    - up to 0.12.0
    - use upstream rules (when building with xorg driver, disabled by default - exists as separate spec)
    - added link patch (fixes Tk library linking)

 linuxwacom-link.patch |   8 ++++
 linuxwacom-rules      |   1 -
 linuxwacom.spec       | 118 +++++++++++++++++++++++++++++++-------------------
 3 files changed, 82 insertions(+), 45 deletions(-)
---

diff --git a/linuxwacom.spec b/linuxwacom.spec
index d8321dd..b2b91cb 100644
--- a/linuxwacom.spec
+++ b/linuxwacom.spec
@@ -7,6 +7,7 @@
 %bcond_with	kernel		# build kernel modules
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	userspace	# don't build userspace programs
+%bcond_with	xorg		# X.org driver (now built from separate package, see xorg-driver-input-wacom.spec)
 %bcond_with	hal		# HAL support (deprecated)
 
 %if %{without kernel}
@@ -16,13 +17,13 @@
 Summary:	Wacom Drivers from Linux Wacom Project
 Summary(pl.UTF-8):	Sterowniki Wacom z projektu Linux Wacom Project
 Name:		linuxwacom
-Version:	0.11.0
+Version:	0.12.0
 Release:	0.1
 License:	GPL v2+
-Group:		X11
+Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/linuxwacom/%{name}-%{version}.tar.bz2
-# Source0-md5:	e524592f7140c695b4daf68039bb6e24
-Source1:	%{name}-rules
+# Source0-md5:	b26cc71889656250be90cc8f43d535c4
+Patch0:		%{name}-link.patch
 URL:		http://linuxwacom.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -35,21 +36,20 @@ BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
+%{!?with_hal:BuildRequires:	sed >= 4.0}
 BuildRequires:	tcl-devel
 BuildRequires:	tk-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXi-devel
-BuildRequires:	xorg-lib-libpciaccess-devel
-BuildRequires:	xorg-xserver-server-devel < 1.7
-%{!?with_hal:BuildConflicts:	hal-devel}
+BuildRequires:	xorg-lib-libXrandr-devel
+%{?with_xorg:BuildRequires:	xorg-lib-libpciaccess-devel}
+%{?with_xorg:BuildRequires:	xorg-xserver-server-devel < 1.7}
 %endif
 Requires:	udev-core >= 030-21
 Requires:	xorg-xserver-server
 #ExclusiveArch:	%{ix86} %{x8664} alpha ia64 ppc sparc sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_x11sdkdir	%(pkg-config --variable=sdkdir xorg-server)
-
 %description
 The Linux Wacom Project manages the drivers, libraries, and
 documentation for configuring and running Wacom tablets under the
@@ -61,6 +61,19 @@ Linux Wacom Project utrzymuje sterowniki, biblioteki i dokumentację
 do konfigurowania i uruchamiania tabletów Wacom pod systemem Linux.
 Zawiera aplikacje diagnostyczne, a także sterowniki XInput do X.org.
 
+%package tk
+Summary:	Linux Wacom Tk library and utilities
+Summary(pl.UTF-8):	Biblioteka i narzędzia Tk z projektu Linux Wacom
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	tk
+
+%description tk
+Linux Wacom Tk library and utilities.
+
+%description tk -l pl.UTF-8
+Biblioteka i narzędzia Tk z projektu Linux Wacom.
+
 %package devel
 Summary:	linuxwacom developmental header files
 Summary(pl.UTF-8):	Pliki nagłówkowe linuxwacom
@@ -87,15 +100,34 @@ linuxwacom static library.
 %description static -l pl.UTF-8
 Statyczna biblioteka linuxwacom.
 
+%package -n xorg-driver-input-wacom
+Summary:	X.org input driver for Wacom tablets
+Summary(pl.UTF-8):	Sterownik wejściowy X.org dla tabletów Wacom
+Group:		X11/Applications
+%requires_xorg_xserver_xinput
+Conflicts:	linuxwacom < 0.12.0
+
+%description -n xorg-driver-input-wacom
+X.org input driver for Wacom tablets.
+
+%description -n xorg-driver-input-wacom -l pl.UTF-8
+Sterownik wejściowy X.org dla tabletów Wacom.
+
 %prep
 %setup -q
+%patch0 -p1
 
+%if %{with kernel}
 cat > src/2.6.30/Makefile << EOF
 obj-m += wacom.o
 wacom-objs := wacom_wac.o wacom_sys.o
 %{?debug:CFLAGS += -DCONFIG_MODULE_NAME_DEBUG=1}
 EOF
-#cp src/2.6.1{6,9}/wacom_wac.h
+%endif
+
+%if %{without hal}
+%{__sed} -i -e 's/hal >= /DISABLED_hal >= /' configure.in
+%endif
 
 %build
 %if %{with kernel}
@@ -110,17 +142,9 @@ EOF
 
 export CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
 %configure \
-	--enable-libwacomcfg \
-	--enable-libwacomxi \
-	--enable-wacdump \
-	--enable-wacomdrv \
-	--enable-xidump \
-	--enable-xsetwacom \
-	--with-tcl \
-	--with-tk \
-	--with-x \
-	--with-xlib \
-	--with-xorg-sdk
+	%{!?with_xorg:--disable-wacomdrv --disable-xsetwacom} \
+	--without-kernel \
+	%{!?with_xorg:--without-xorg-sdk}
 
 %{__make}
 %endif
@@ -133,7 +157,10 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	x86moduledir=%{_libdir}/xorg/modules/input
 
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-wacom.rules
+%if %{with xorg}
+install -D src/util/60-wacom.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-wacom.rules
+%endif
+
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/TkXInput/libwacomxi.{la,a}
 %endif
 
@@ -152,36 +179,39 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/wacdump
-%attr(755,root,root) %{_bindir}/wacomcpl*
 %attr(755,root,root) %{_bindir}/xidump
-%attr(755,root,root) %{_bindir}/xsetwacom
-%attr(755,root,root) %{_libdir}/libwacomcfg*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libwacomcfg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwacomcfg.so.0
+%if %{with hal}
+%{_libexecdir}/hal-setup-wacom
+%{_datadir}/hal/fdi/policy/20thirdparty/10-linuxwacom.fdi
+%endif
+
+%files tk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wacomcpl
+%attr(755,root,root) %{_bindir}/wacomcpl-exec
 %dir %{_libdir}/TkXInput
 %attr(755,root,root) %{_libdir}/TkXInput/libwacomxi.so*
 %{_libdir}/TkXInput/pkgIndex.tcl
-%{_mandir}/man4/wacom.4*
-%{_mandir}/man4/xsetwacom.4*
-%attr(755,root,root) %{_libdir}/libwacomcfg.so.0
-%attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
-/etc/udev/rules.d/10-wacom.rules
-%{_libdir}/hal-setup-wacom
-%{_datadir}/hal/fdi/policy/20thirdparty/10-linuxwacom.fdi
-
-#%%files tk
-#%attr(755,root,root) %{_bindir}/wacomcpl
-#%attr(755,root,root) %{_bindir}/wacomcpl-exec
-#%dir %{_libdir}/TkXInput
-#%attr(755,root,root) %{_libdir}/TkXInput/libwacomxi.so*
-#%{_libdir}/TkXInput/pkgIndex.tcl
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwacomcfg*.so
-%{_libdir}/libwacomcfg*.la
-%dir %{_includedir}/wacomcfg
-%{_includedir}/wacomcfg/wacomcfg.h
+%attr(755,root,root) %{_libdir}/libwacomcfg.so
+%{_libdir}/libwacomcfg.la
+%{_includedir}/wacomcfg
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libwacomcfg*.a
+%{_libdir}/libwacomcfg.a
+
+%if %{with xorg}
+%files -n xorg-driver-input-wacom
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xsetwacom
+%attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
+/lib/udev/rules.d/60-wacom.rules
+%{_mandir}/man4/wacom.4*
+%{_mandir}/man4/xsetwacom.4*
+%endif
 %endif
diff --git a/linuxwacom-link.patch b/linuxwacom-link.patch
new file mode 100644
index 0000000..792668e
--- /dev/null
+++ b/linuxwacom-link.patch
@@ -0,0 +1,8 @@
+--- linuxwacom-0.12.0/src/wacomxi/Makefile.am.orig	2017-04-18 00:21:29.000000000 +0200
++++ linuxwacom-0.12.0/src/wacomxi/Makefile.am	2017-11-30 20:54:20.869824693 +0100
+@@ -14,4 +14,4 @@
+ # Source dependencies
+ libwacomxi_la_SOURCES = wacomxi.c wacomxi.h
+ libwacomxi_la_LDFLAGS = -no-undefined
+-libwacomxi_la_LIBADD = @WCM_WACOMXI_LIBS@
++libwacomxi_la_LIBADD = @WCM_WACOMXI_LIBS@ -ltk -ltcl
diff --git a/linuxwacom-rules b/linuxwacom-rules
deleted file mode 100644
index 857a754..0000000
--- a/linuxwacom-rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="event*", SYSFS{idVendor}=="056a", NAME="input/%k", SYMLINK="input/wacom"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linuxwacom.git/commitdiff/429ae2a2668616f8f179cf9fd911ffd087e2e203

