SPECS: template-kernel-module.spec - merge up/smp kernel infrastru...

[pluto]

Author: pluto                        Date: Fri Mar 16 10:06:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge up/smp kernel infrastructure. th will use only smp.

---- Files affected:
SPECS:
   template-kernel-module.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/template-kernel-module.spec
diff -u SPECS/template-kernel-module.spec:1.45 SPECS/template-kernel-module.spec:1.46
--- SPECS/template-kernel-module.spec:1.45	Wed Mar 14 01:07:37 2007
+++ SPECS/template-kernel-module.spec	Fri Mar 16 11:06:15 2007
@@ -6,8 +6,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 programs
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -35,7 +33,7 @@
 #URL:		-
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 #BuildRequires:	-
 #Requires(postun):	-
@@ -60,8 +58,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 
 %description -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
@@ -74,27 +72,6 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
-Summary:	Linux SMP driver for MODULE_NAME
-Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do MODULE_NAME
-Release:	%{_rel}@%{_kernel_ver_str}
-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-MODULE_DIR-MODULE_NAME
-This is driver for MODULE_NAME for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME -l pl.UTF-8
-Sterownik dla Linuksa do MODULE_NAME.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 # prepare makefile:
 cat > path/to/dir/Makefile << EOF
@@ -163,26 +140,12 @@
 %postun	-n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
-%depmod %{_kernel_ver}smp
-
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/MODULE_DIR/*.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/MODULE_DIR/*.ko*
-%endif
-%endif
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -195,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007/03/16 10:06:15  pluto
+- merge up/smp kernel infrastructure. th will use only smp.
+
 Revision 1.45  2007/03/14 00:07:37  glen
 - default some version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-kernel-module.spec?r1=1.45&r2=1.46&f=u