- updated kernel modules build system

diff --git a/igb.spec b/igb.spec
index b2f96ee83ef87807eaf96a8e8828456502a66b5b..3e612b6a0c5ce73c2765175aec7a8c033db6285a 100644 (file)
--- a/igb.spec
+++ b/igb.spec
@@ -1,20 +1,6 @@
 # Conditional build:
 %bcond_with    verbose         # verbose build (V=1)
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
-%define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-%define                ikpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
-
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
@@ -32,8 +18,8 @@ Group:                Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5: b59b8d5ae7d8f53f3481004051fb7b87
 URL:           http://sourceforge.net/projects/e1000/
-%{?with_kernel:BuildRequires:  kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires: rpm-build-macros >= 1.678
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires: rpm-build-macros >= 1.701
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -90,7 +76,7 @@ alias igb igb-current\
 EOF\
 %{nil}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -108,13 +94,13 @@ EXTRA_CFLAGS += -DDRIVER_NAME_CAPS=IGB
 EOF
 
 %build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man7
 
-%{expand:%ikpkg}
+%{expand:%install_kernel_packages}
 cp -a installed/* $RPM_BUILD_ROOT
 
 cp -a igb.7 $RPM_BUILD_ROOT%{_mandir}/man7