SPECS: kernel-net-r1000.spec - use new kernel macros

[shadzik]

Author: shadzik                      Date: Tue Apr 17 11:39:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros

---- Files affected:
SPECS:
   kernel-net-r1000.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-r1000.spec
diff -u SPECS/kernel-net-r1000.spec:1.9 SPECS/kernel-net-r1000.spec:1.10
--- SPECS/kernel-net-r1000.spec:1.9	Wed Mar 14 10:59:10 2007
+++ SPECS/kernel-net-r1000.spec	Tue Apr 17 13:39:13 2007
@@ -5,8 +5,6 @@
 # - check patch0 MODULE_PARM (...) -> module_param (...)
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_name	kernel-net-r1000
@@ -22,12 +20,12 @@
 # Source0-md5:	4120f50c55b38b67e5dc741f86a1923a
 # Patch0:		%{_name}-module_parm.patch
 URL:		http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PNid=5&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#RTL8111B/RTL8168B/RTL8111/RTL8168
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.379
 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
 Provides:	kernel(r1000)
 BuildRoot:	%{tmpdir}/%{_name}-%{version}-root-%(id -u -n)
@@ -40,26 +38,6 @@
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 Realtek RTL8111B/RTL8168B/RTL8111/RTL8168.
 
-%package -n kernel%{_alt_kernel}-smp-net-r1000
-Summary:	RTL8111B/RTL8168B/RTL8111/RTL8168 driver for Linux SMP
-Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kart RTL8111B/RTL8168B/RTL8111/RTL8168
-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
-Provides:	kernel(r1000)
-
-%description -n kernel%{_alt_kernel}-smp-net-r1000
-This package contains the Linux SMP driver for the Realtek
-family of RTL8111B/RTL8168B/RTL8111/RTL8168 Ethernet network adapters.
-
-%description -n kernel%{_alt_kernel}-smp-net-r1000 -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
-Realtek RTL8111B/RTL8168B/RTL8111/RTL8168.
-
 %prep
 %setup -q -n r1000_v%{version}
 #%%patch0 -p1
@@ -81,25 +59,10 @@
 %postun	-n kernel%{_alt_kernel}-net-r1000
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-r1000
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-r1000
-%depmod %{_kernel_ver}smp
-
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-r1000
 %defattr(644,root,root,755)
 %doc README release_note.txt
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/*
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-r1000
-%defattr(644,root,root,755)
-%doc README release_note.txt
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/*
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -107,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/04/17 11:39:13  shadzik
+- use new kernel macros
+
 Revision 1.9  2007/03/14 09:59:10  megabajt
 - up bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-r1000.spec?r1=1.9&r2=1.10&f=u