SPECS: linuxwacom.spec - up to 0.7.8-3, TODO-build kernel modules

[wolvverine]

Author: wolvverine                   Date: Tue Sep 11 14:56:11 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.7.8-3, TODO-build kernel modules

---- Files affected:
SPECS:
   linuxwacom.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.20 SPECS/linuxwacom.spec:1.21
--- SPECS/linuxwacom.spec:1.20	Wed Mar 14 01:19:43 2007
+++ SPECS/linuxwacom.spec	Tue Sep 11 16:56:06 2007
@@ -3,31 +3,29 @@
 # - no package for kernel modules, even if they're built
 #
 # Conditional build:
-%bcond_without  dist_kernel     # allow non-distribution kernel
-%bcond_without  kernel          # don't build kernel modules
-%bcond_without  up				# don't build UP module
-%bcond_without  smp             # don't build SMP module
-%bcond_without  userspace       # don't build userspace programs
-%bcond_with     verbose         # verbose build (V=1)
+%bcond_without  dist_kernel	# allow non-distribution kernel
+%bcond_without  kernel		# don't build kernel modules
+%bcond_without  userspace	# don't build userspace programs
+%bcond_with     verbose		# verbose build (V=1)
 
+%define		relver		3
 %if %{without kernel}
-%undefine       with_dist_kernel
+%undefine	with_dist_kernel
 %endif
 
 Summary:	Wacom Drivers from Linux Wacom Project
 Summary(pl.UTF-8):	Sterowniki Wacom z projektu Linux Wacom Project
 Name:		linuxwacom
-Version:	0.7.5
-Release:	2
+Version:	0.7.8
+Release:	1
 Group:		X11
 License:	GPL/X11
-Source0:	http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-4.tar.bz2
-# Source0-md5:	bbf698eba5f391ca6eddb3fd0232f2de
+Source0:	http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-%{relver}.tar.bz2
+# Source0-md5:	19214c30e68114bb2101a287b11b8f32
 Source1:	linuxwacom-rules
-Patch1:		%{name}-xorg-7.patch
 URL:		http://linuxwacom.sourceforge.net/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:      kernel%{_alt_kernel}-module-build >= 3:2.6.14}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
 BuildRequires:  rpmbuild(macros) >= 1.308
 %endif
 %if %{with userspace}
@@ -86,8 +84,7 @@
 Statyczna biblioteka linuxwacom.
 
 %prep
-%setup -q -n %{name}-%{version}-4
-%patch1 -p1
+%setup -q -n %{name}-%{version}-%{relver}
 
 %build
 %if %{with userspace}
@@ -100,8 +97,6 @@
 #if [ "$(getconf LONG_BIT)" == "64" ]; then
 #	XSERVER64=--enable-xserver64
 #fi
-
-#export RPM_LIBDIR=%{_lib}
 export CFLAGS="-I%{_includedir}/ncurses %{rpmcflags}"
 %configure \
 	--with-gtk \
@@ -135,24 +130,7 @@
 %endif
 
 %if %{with kernel}
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-                exit 1
-        fi
-        install -d o/include/linux
-        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-%if %{with dist_kernel}
-        %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts XORG_SDK_DIR=%{_x11sdkdir}
-%else
-        install -d o/include/config
-        touch o/include/config/MARKER
-        ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-
-done
+%build_kernel_modules -m wacom
 %endif
 
 %install
@@ -168,7 +146,6 @@
 
 %if %{with userspace}
 
-
 %endif
 
 install src/xdrv/wacom_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
@@ -220,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/09/11 14:56:06  wolvverine
+- up to 0.7.8-3, TODO-build kernel modules
+
 Revision 1.20  2007/03/14 00:19:43  glen
 - err, todo?
 
================================================================

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