SPECS: svgalib.spec - cleanups related to !dist_kernel

[qboosh]

Author: qboosh                       Date: Wed Oct 12 17:03:23 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups related to !dist_kernel

---- Files affected:
SPECS:
   svgalib.spec (1.144 -> 1.145) 

---- Diffs:

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.144 SPECS/svgalib.spec:1.145
--- SPECS/svgalib.spec:1.144	Mon Oct 10 14:24:52 2005
+++ SPECS/svgalib.spec	Wed Oct 12 19:03:17 2005
@@ -316,7 +316,7 @@
 %if %{with kernel}
 %if %{kernel26}
 cd kernel/svgalib_helper
-ln -sf %{_kernelsrcdir}/config-up .config
+ln -sf %{_kernelsrcdir}/config-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist} .config
 install -d include/{linux,config}
 ln -sf %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h
 ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
@@ -338,7 +338,7 @@
 	 kernel/svgalib_helper-up.%{kmodext}
 rm -f kernel/svgalib_helper/*.*o
 
-%if %{with smp}
+%if %{with dist_kernel} && %{with smp}
 %if %{kernel26}
 cd kernel/svgalib_helper
 ln -sf %{_kernelsrcdir}/config-smp .config
@@ -363,10 +363,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/lib/svgalib \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
 %if %{with userspace}
+install -d $RPM_BUILD_ROOT/var/lib/svgalib
 %{__make} installheaders installsharedlib installconfig installstaticlib \
 	installutils installman lib3dkit-install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -382,9 +381,11 @@
 %endif
 
 %if %{with kernel}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 install kernel/svgalib_helper-up.%{kmodext} \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/svgalib_helper.%{kmodext}
-%if %{with smp}
+%if %{with dist_kernel} && %{with smp}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
 install kernel/svgalib_helper/svgalib_helper.%{kmodext} \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/svgalib_helper.%{kmodext}
 %endif
@@ -440,7 +441,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/svgalib_helper.%{kmodext}*
 
-%if %{with smp}
+%if %{with dist_kernel} && %{with smp}
 %files -n kernel%{k24}-smp-video-svgalib_helper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/svgalib_helper.%{kmodext}*
@@ -453,6 +454,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.145  2005/10/12 17:03:17  qboosh
+- cleanups related to !dist_kernel
+
 Revision 1.144  2005/10/10 12:24:52  qboosh
 - updated to 1.9.23, updated pld,DESTDIR patches, removed obsolete linux26 patch
 - package vga_reset program on x86
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/svgalib.spec?r1=1.144&r2=1.145&f=u