- updated kernel modules build system

diff --git a/nvidiabl.spec b/nvidiabl.spec
index a448d48904825289b7633d3707c00f5cc62387fb..2bbcde4c8374b30eecb3bae37cea03433ae75b2d 100644 (file)
--- a/nvidiabl.spec
+++ b/nvidiabl.spec
@@ -3,25 +3,11 @@
 %bcond_without verbose         # verbose build (V=1)
 %bcond_without dkms            # build dkms package
 
-%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                _duplicate_files_terminate_build        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     1
 %define                pname   nvidiabl
 Summary:       Linux driver for nVidia display back-lights
@@ -36,8 +22,8 @@ Source1:      modprobe.conf
 Patch0:                nvidiabl-dkmsconf.patch
 # Source0-md5: e9418d3e500172d79680e44ad0f85743
 URL:           https://github.com/guillaumezin/nvidiabl
-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}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -141,14 +127,14 @@ zalecany.\
 %install_kernel_modules -D installed -m nvidiabl -d misc\
 %{nil}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -qn %{pname}-%{version}
 %patch0 -p1
 
 %build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT