- uppdated kernel modules build system

diff --git a/rtl8812au.spec b/rtl8812au.spec
index d247d8199ee297155b2539046168444cf2c1bdea..8d0d7f8073b096fe92f7a4dd8a84f492886535d2 100644 (file)
--- a/rtl8812au.spec
+++ b/rtl8812au.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     5
 %define                snap    20140901
 %define                pname   rtl8812au
@@ -40,8 +26,8 @@ Patch3:               update-cfg80211-support.patch
 Patch4:                warnings.patch
 Patch5:                gcc-4.9.patch
 Patch6:                linux-3.18.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
@@ -76,7 +62,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
 %install_kernel_modules -D installed -m 8812au -d kernel/drivers/net/wireless\
 %{nil}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
 #%setup -q -n %{pname}-%{version}
@@ -90,7 +76,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
 %patch6 -p1
 
 %build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT