Author: wolvverine Date: Wed Sep 12 00:57:12 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- build userspace
---- Files affected:
SPECS:
linuxwacom.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.21 SPECS/linuxwacom.spec:1.22
--- SPECS/linuxwacom.spec:1.21 Tue Sep 11 16:56:06 2007
+++ SPECS/linuxwacom.spec Wed Sep 12 02:57:07 2007
@@ -3,10 +3,10 @@
# - 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 userspace # don't build userspace programs
-%bcond_with verbose # verbose build (V=1)
+%bcond_without dist_kernel # allow non-distribution kernel
+%bcond_with 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}
@@ -113,13 +113,13 @@
--enable-libwacomcfg \
--enable-xsetwacom \
--enable-libwacomxi \
- --enable-tabletdev \
- --enable-wacomdrv \
+ --disable-tabletdev \
+ --disable-wacomdrv \
--enable-modver \
- --with-kernel=%{_kernelsrcdir} \
- --enable-wacom
+ --disable-wacom
-# --enable-hid
+#-with-kernel=%{_kernelsrcdir}
+#-enable-hid
# for 2.4 only --enable-usbmouse
# for 2.4 only --enable-input
# for 2.4 only --enable-mousedev
@@ -127,6 +127,7 @@
# --enable-xserver64 Use specified X server bit [default=usually]
# --enable-mkxincludes Enable mkxincludes, XF86 dependency builder [default=no]
# --with-xmoduledir Specify wacom_drv path explicitly. Implies
--enable-dlloader
+%{__make}
%endif
%if %{with kernel}
@@ -145,13 +146,13 @@
x86moduledir=$RPM_BUILD_ROOT%{_libdir}/xorg/modules/input
%if %{with userspace}
-
+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
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/TkXInput/libwacomxi.{la,a}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -167,11 +168,14 @@
%attr(755,root,root) %{_bindir}/xidump
%attr(755,root,root) %{_bindir}/xsetwacom
%attr(755,root,root) %{_libdir}/libwacomcfg*.so.*.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
%dir %{_libdir}/TkXInput
%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
@@ -197,6 +201,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2007/09/12 00:57:07 wolvverine
+- build userspace
+
Revision 1.21 2007/09/11 14:56:06 wolvverine
- up to 0.7.8-3, TODO-build kernel modules
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/linuxwacom.spec?r1=1.21&r2=1.22&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
