SPECS: linuxwacom.spec - missing dir, some cleanups

[qboosh]

Author: qboosh                       Date: Sat Sep  9 08:43:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- missing dir, some cleanups

---- Files affected:
SPECS:
   linuxwacom.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.11 SPECS/linuxwacom.spec:1.12
--- SPECS/linuxwacom.spec:1.11	Wed Sep  6 16:02:28 2006
+++ SPECS/linuxwacom.spec	Sat Sep  9 10:43:38 2006
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+#
+# Conditional build:
 %bcond_without  dist_kernel     # allow non-distribution kernel
 %bcond_without  kernel          # don't build kernel modules
 %bcond_without  smp             # don't build SMP module
@@ -26,15 +28,17 @@
 %{?with_dist_kernel:BuildRequires:      kernel%{_alt_kernel}-module-build >= 3:2.6.14}
 BuildRequires:  rpmbuild(macros) >= 1.308
 %endif
-#BuildRequires:	
-Requires(post,postun):  /sbin/depmod
-
-BuildRequires:	tk-devel
+%if %{with userspace}
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	ncurses-devel
 BuildRequires:	tcl-devel
+BuildRequires:	tk-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-xserver-server-devel
-BuildRequires:	ncurses-devel
+%endif
 Requires:	xorg-xserver-server
 Requires:	udev >= 030-21
 #ExclusiveArch:	%{ix86} %{x8664} alpha ia64 ppc sparc sparc64
@@ -85,6 +89,7 @@
 #%patch3 -p0
 
 %build
+%if %{with userspace}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -126,9 +131,6 @@
 # --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
-%if %{with userspace}
-
-
 %endif
 
 %if %{with kernel}
@@ -152,7 +154,6 @@
 done
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -179,13 +180,12 @@
 #%%endif
 #%%endif
 
-
-
-
 install src/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}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -201,19 +201,18 @@
 %attr(755,root,root) %{_bindir}/xsetwacom
 %attr(755,root,root) %{_libdir}/libwacomcfg*.so.*.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
-%attr(755,root,root) %{_libdir}/TkXInput/libwacomxi.so.0.0.0
-%{_libdir}/TkXInput/libwacomxi.a
-%{_libdir}/TkXInput/libwacomxi.la
+%dir %{_libdir}/TkXInput
+%attr(755,root,root) %{_libdir}/TkXInput/libwacomxi.so*
+%{_libdir}/TkXInput/pkgIndex.tcl
 
 %{_sysconfdir}/udev/rules.d/10-wacom.rules
 
 #%%files tk
-#/usr/bin/wacomcpl
-#/usr/bin/wacomcpl-exec
-#/usr/lib/TkXInput/libwacomxi.a
-#/usr/lib/TkXInput/libwacomxi.la
-#/usr/lib/TkXInput/libwacomxi.so.0.0.0
-#/usr/lib/TkXInput/pkgIndex.tcl
+#%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)
@@ -232,6 +231,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/09/09 08:43:38  qboosh
+- missing dir, some cleanups
+
 Revision 1.11  2006/09/06 14:02:28  sparky
 - no md5 for CVS file
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linuxwacom.spec?r1=1.11&r2=1.12&f=u