SPECS: linuxwacom.spec - kernel module now builds; proper bconds, ...

[zbyniu]

Author: zbyniu                       Date: Wed Sep 12 01:49:12 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kernel module now builds; proper bconds, cleanups

---- Files affected:
SPECS:
   linuxwacom.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.22 SPECS/linuxwacom.spec:1.23
--- SPECS/linuxwacom.spec:1.22	Wed Sep 12 02:57:07 2007
+++ SPECS/linuxwacom.spec	Wed Sep 12 03:49:07 2007
@@ -1,10 +1,14 @@
 # $Revision$, $Date$
 # TODO
 # - no package for kernel modules, even if they're built
+# 
+# NOTE
+# - looks that kernel module is mainstream now, probably building it here
+#   should be removed
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_with	kernel		# don't build kernel modules
+%bcond_with	kernel		# build kernel modules
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -25,8 +29,8 @@
 Source1:	linuxwacom-rules
 URL:		http://linuxwacom.sourceforge.net/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires:  rpmbuild(macros) >= 1.308
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:  rpmbuild(macros) >= 1.379
 %endif
 %if %{with userspace}
 BuildRequires:	autoconf
@@ -86,7 +90,18 @@
 %prep
 %setup -q -n %{name}-%{version}-%{relver}
 
+cat > src/2.6.19/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
+
 %build
+%if %{with kernel}
+%build_kernel_modules -C src/2.6.19 -m wacom
+%endif
+
 %if %{with userspace}
 %{__libtoolize}
 %{__aclocal}
@@ -114,9 +129,8 @@
 	--enable-xsetwacom \
 	--enable-libwacomxi \
 	--disable-tabletdev \
-	--disable-wacomdrv \
 	--enable-modver \
-	--disable-wacom
+	--enable-wacom
 
 #-with-kernel=%{_kernelsrcdir}
 #-enable-hid
@@ -130,28 +144,21 @@
 %{__make}
 %endif
 
-%if %{with kernel}
-%build_kernel_modules -m wacom
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d \
-	$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
-
+%if %{with userspace}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	x86moduledir=$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
+	x86moduledir=%{_libdir}/xorg/modules/input
 
-%if %{with userspace}
+#install src/xdrv/wacom_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-wacom.rules
 rm -f $RPM_BUILD_ROOT%{_libdir}/TkXInput/libwacomxi.{la,a}
 %endif
 
 %if %{with kernel}
-install src/xdrv/wacom_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-wacom.rules
+%install_kernel_modules -m src/2.6.19/wacom -d misc
 %endif
 
 %clean
@@ -161,6 +168,7 @@
 %postun	-p /sbin/ldconfig
 
 %files
+%if %{with userspace}
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README NEWS
 %attr(755,root,root) %{_bindir}/wacdump
@@ -172,10 +180,8 @@
 %attr(755,root,root) %{_libdir}/TkXInput/libwacomxi.so*
 %{_libdir}/TkXInput/pkgIndex.tcl
 %{_mandir}/man4/*.4*
-%if %{with kernel}
 %attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
 %{_sysconfdir}/udev/rules.d/10-wacom.rules
-%endif
 
 #%%files tk
 #%attr(755,root,root) %{_bindir}/wacomcpl
@@ -194,6 +200,7 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libwacomcfg*.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -201,6 +208,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/09/12 01:49:07  zbyniu
+- kernel module now builds; proper bconds, cleanups
+
 Revision 1.22  2007/09/12 00:57:07  wolvverine
 - build userspace
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/linuxwacom.spec?r1=1.22&r2=1.23&f=u