SPECS: nozomi.spec - %requires_releq_kernel

[wolvverine]

Author: wolvverine                   Date: Wed May  2 16:54:52 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %requires_releq_kernel

---- Files affected:
SPECS:
   nozomi.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/nozomi.spec
diff -u SPECS/nozomi.spec:1.6 SPECS/nozomi.spec:1.7
--- SPECS/nozomi.spec:1.6	Mon Feb 12 23:09:10 2007
+++ SPECS/nozomi.spec	Wed May  2 18:54:47 2007
@@ -2,12 +2,8 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 
-#
-# main package.
-#
 %define		_rel	1
 Summary:	HSDPA driver for Broadband Wireless Data Card - Globe Trotter
 Summary(pl.UTF-8):	Sterownik HSDPA dla kart bezprzewodowych Globe Trotter
@@ -31,50 +27,25 @@
 %description -l pl.UTF-8
 Sterownik HSDPA dla kart bezprzewodowych Globe Trotter.
 
-%package -n kernel-char-nozomi
+%package -n kernel%{_alt_kernel}-char-%{name}
 Summary:	Linux HSDPA driver for Broadband Wireless Data Card - Globe Trotter
 Summary(pl.UTF-8):	Sterownik HSDPA dla Linuksa do kart bezprzewodowych Globe Trotter
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
-%endif
+%{?with_dist_kernel:%requires_releq_kernel}
 
-%description -n kernel-char-nozomi
+%description -n kernel%{_alt_kernel}-char-%{name}
 This is HSDPA driver for Broadband Wireless Data Card - Globe Trotter
 for Linux.
 
 This package contains Linux module.
 
-%description -n kernel-char-nozomi -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-char-%{name} -l pl.UTF-8
 Sterownik HSDPA dla Linuksa do kart bezprzewodowych Globe Trotter.
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel-smp-char-nozomi
-Summary:	Linux SMP HSDPA driver for Broadband Wireless Data Card - Globe Trotter
-Summary(pl.UTF-8):	Sterownik HSDPA dla Linuksa SMP do kart bezprzewodowych Globe Trotter
-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-smp-char-nozomi
-This is HSDPA driver for Broadband Wireless Data Card - Globe Trotter
-for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel-smp-char-nozomi -l pl.UTF-8
-Sterownik HSDPA dla Linuksa do kart bezprzewodowych Globe Trotter.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q -c
 %patch0 -p1
@@ -83,12 +54,12 @@
 
 %build
 
-%build_kernel_modules -m nozomi
+%build_kernel_modules -m %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%install_kernel_modules -m nozomi -d kernel/drivers/char
+%install_kernel_modules -m %{name} -d kernel/drivers/char
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,22 +70,11 @@
 %postun	-n kernel-char-nozomi
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-char-nozomi
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel-smp-char-nozomi
-%depmod %{_kernel_ver}smp
-
-%files -n kernel-char-nozomi
-%defattr(644,root,root,755)
-%doc CHANGELOG readme todo
-/lib/modules/%{_kernel_ver}/kernel/drivers/char/*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-char-nozomi
+%if %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-char-%{name}
 %defattr(644,root,root,755)
 %doc CHANGELOG readme todo
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/char/*.ko*
+/lib/modules/%{_kernel_ver}kernel/drivers/char/*.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -123,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/05/02 16:54:47  wolvverine
+- %requires_releq_kernel
+
 Revision 1.6  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nozomi.spec?r1=1.6&r2=1.7&f=u