- updated kernel modules build system

diff --git a/r8168.spec b/r8168.spec
index 30bdf90c262b040852ba890380977c025fd9fe5c..8ab2b6a959c10ac074a13f20b9d24853d07b395b 100644 (file)
--- a/r8168.spec
+++ b/r8168.spec
@@ -1,23 +1,9 @@
 # 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
-
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
-%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
-%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                rel     2
 %define                pname   r8168
 Summary:       Linux driver for RTL8111/8168B PCI Express Gigabit Ethernet controllers
@@ -35,8 +21,8 @@ Source0:      %{pname}-%{version}.tar.bz2
 # Source0-md5: fe2962824587070a2ec53f77e40b0fea
 Patch0:                linux-3.15.patch
 Patch1:                linux-3.16.patch
-BuildRequires: rpmbuild(macros) >= 1.678
-%{expand:%kbrs}
+BuildRequires: rpmbuild(macros) >= 1.701
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,7 +68,7 @@ Express Gigabit Ethernet.\
 %install_kernel_modules -D installed -m src/r8168 -d kernel/drivers/net\
 %{nil}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -90,7 +76,7 @@ Express Gigabit Ethernet.\
 %patch1 -p1
 
 %build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT