SPECS: em8300.spec - drop up/smp

[glen]

Author: glen                         Date: Thu Apr  3 20:46:38 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop up/smp

---- Files affected:
SPECS:
   em8300.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.53 SPECS/em8300.spec:1.54
--- SPECS/em8300.spec:1.53	Thu Apr  3 22:39:52 2008
+++ SPECS/em8300.spec	Thu Apr  3 22:46:33 2008
@@ -5,8 +5,6 @@
 # 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 tools
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -111,22 +109,6 @@
 %description -n kernel%{_alt_kernel}-video-em8300 -l pl.UTF-8
 Moduły jądra Linuksa em8300.
 
-%package -n kernel%{_alt_kernel}-smp-video-em8300
-Summary:	em8300 Linux SMP kernel modules
-Summary(pl.UTF-8):	Moduły jądra Linuksa SMP em8300
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-video-em8300
-em8300 Linux SMP kernel modules.
-
-%description -n kernel%{_alt_kernel}-smp-video-em8300 -l pl.UTF-8
-Moduły jądra Linuksa SMP em8300.
-
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p0
@@ -143,7 +125,7 @@
 
 %if %{with kernel}
 cd modules
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
+for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
@@ -191,17 +173,11 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/video
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/video
 for i in adv717x bt865 em8300; do
-	install modules/$i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+	install modules/$i-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/video/$i.ko
 done
-%if %{with smp} && %{with dist_kernel}
-for i in adv717x bt865 em8300; do
-	install modules/$i-smp.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/video/$i.ko
-done
-%endif
 %endif
 
 %clean
@@ -223,12 +199,6 @@
 %postun	-n kernel%{_alt_kernel}-video-em8300
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-video-em8300
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-video-em8300
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -256,25 +226,20 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-em8300
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/video/*.ko*
 %endif
 
-%if %{with dist_kernel} && %{with smp}
-%files -n kernel%{_alt_kernel}-smp-video-em8300
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/video/*.ko*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2008-04-03 20:46:33  glen
+- drop up/smp
+
 Revision 1.53  2008-04-03 20:39:52  glen
 - merge alt kernel and other fixes from AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/em8300.spec?r1=1.53&r2=1.54&f=u