Author: wolvverine Date: Sat Aug 12 22:08:35 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- patch and correct
---- Files affected:
SPECS:
linuxwacom.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.5 SPECS/linuxwacom.spec:1.6
--- SPECS/linuxwacom.spec:1.5 Sat Aug 12 21:23:57 2006
+++ SPECS/linuxwacom.spec Sun Aug 13 00:08:29 2006
@@ -1,4 +1,14 @@
# $Revision$, $Date$
+%bcond_without dist_kernel # allow non-distribution kernel
+%bcond_without kernel # don't build kernel modules
+%bcond_without smp # don't build SMP module
+%bcond_without userspace # don't build userspace programs
+%bcond_with verbose # verbose build (V=1)
+
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+
Summary: Wacom Drivers from Linux Wacom Project
Summary(pl): Sterowniki Wacom z projektu Linux Wacom Project
Name: linuxwacom
@@ -9,17 +19,28 @@
Source0:
http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-3.tar.bz2
# Source0-md5: 9414aa852c97b8addb32481db04be9e5
#Source1: 10-wacom.rules
-#Patch2: %{name}-fsp.patch
+Patch1: %{name}-xorg-7.patch
#Patch3: %{name}-0.7.2-modular-sdk.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-source }
+
+BuildRequires: rpmbuild(macros) >= 1.308
+%endif
#BuildRequires:
-Requires: inKernel2.6.14NeedsNewHidAndWacomModule
-BuildRequires: kernel-source
+Requires(post,postun): /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun): %releq_kernel_up
+
+BuildRequires: tk-devel
+BuildRequires: tcl-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXi-devel
-#BuildRequires: xorg-x11-server-sdk
BuildRequires: ncurses-devel
-Requires: Xserver, udev >= 030-21
+Requires: Xserver
+Requires: udev >= 030-21
#ExclusiveArch: %{ix86} %{x8664} alpha ia64 ppc sparc sparc64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,7 +87,7 @@
%prep
%setup -q -n %{name}-%{version}-3
-#%patch2 -p1
+%patch1 -p1
#%patch3 -p0
%build
@@ -83,40 +104,60 @@
#export RPM_LIBDIR=%{_lib}
export CFLAGS="-I%{_includedir}/ncurses %{rpmcflags}"
%configure \
- --without-gtk \
- --without-tcl \
- --without-tk \
- --disable-wacomxi \
- --disable-libwacomxi \
- --with-xorg-sdk=%{_x11sdkdir} \
- --with-xlib=%{_x11libdir} \
+ --with-gtk \
+ --with-tcl \
+ --with-tk \
+ --enable-wacomxi \
+ --enable-libwacomxi \
+ --with-xorg-sdk \
+ --with-xlib \
--enable-dlloader \
--with-x \
- --enable-wacom \
--enable-wacdump \
--enable-xidump \
--enable-libwacomcfg \
--enable-xsetwacom \
--enable-libwacomxi \
- --enable-hid \
--enable-tabletdev \
--enable-wacomdrv \
- --enable-modver \
- --with-kernel=%{_kernelsrcdir}
+ --enable-modver \
+ --with-kernel=%{_kernelsrcdir} \
+ --enable-hid \
+ --enable-wacom
# for 2.4 only --enable-usbmouse
# for 2.4 only --enable-input
# for 2.4 only --enable-mousedev
-# for 2.4 --enable-evdev
-# --with-kernel=%{_kernelsrcdir}
+# for 2.4 only --enable-evdev
# --enable-xserver64 Use specified X server bit [default=usually]
# --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no]
-# --with-x-src=dir Specify X driver build directory
-# --with-tcl=dir uses a specified tcl directory
-# --with-tk=dir uses a specified tk directory
# --with-xmoduledir Specify wacom_drv path explicitly. Implies
--enable-dlloader
-%{__make} \
- XORG_SDK_DIR=%{_x11sdkdir}
+%if %{with userspace}
+
+
+%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} -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
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -129,9 +170,27 @@
DESTDIR=$RPM_BUILD_ROOT \
x86moduledir=$RPM_BUILD_ROOT%{_x11libdir}/xorg/modules/input
+%if %{with userspace}
+
+
+%endif
+
+#%%if %{with kernel}
+#install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/MODULE_DIR
+#install MODULE_NAME-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+# $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/MODULE_DIR/MODULE_NAME.ko
+#%%if %{with smp} && %{with dist_kernel}
+#install MODULE_NAME-smp.ko \
+#
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/MODULE_DIR/MODULE_NAME.ko
+#%%endif
+#%%endif
+
+
+
+
install src/wacom_drv.so $RPM_BUILD_ROOT%{_x11libdir}/xorg/modules/input
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-wacom.rules
+#install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-wacom.rules
%clean
rm -rf $RPM_BUILD_ROOT
@@ -146,8 +205,8 @@
%attr(755,root,root) %{_bindir}/xidump
%attr(755,root,root) %{_bindir}/xsetwacom
%attr(755,root,root) %{_libdir}/libwacomcfg*.so.*.*.*
-%attr(755,root,root) %{_x11libdir}/xorg/modules/input/wacom_drv.so
-%{_sysconfdir}/udev/rules.d/10-wacom.rules
+%%attr(755,root,root) %{_x11libdir}/xorg/modules/input/wacom_drv.so
+#%%{_sysconfdir}/udev/rules.d/10-wacom.rules
%files devel
%defattr(644,root,root,755)
@@ -166,6 +225,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2006/08/12 22:08:29 wolvverine
+- patch and correct
+
Revision 1.5 2006/08/12 19:23:57 wolvverine
add BR, NFY
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/linuxwacom.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
