- updated kernel modules build system

diff --git a/ipset.spec b/ipset.spec
index 0b24e64cc5b09a16c2e35a1dde3b799e216a7f3b..cbf8c3c1fad37676915797dcfacbf986592a3142 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -4,15 +4,10 @@
 #        the dependencies here
 #
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
 %bcond_without userspace       # don't build userspace tools
 %bcond_with    verbose         # verbose build (V=1)
 
-%if %{without kernel}
-%undefine      with_dist_kernel
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -22,26 +17,11 @@
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine      with_userspace
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 %endif
 
-%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   ipset
 Summary:       IP sets utility
@@ -63,8 +43,8 @@ BuildRequires:        libltdl-devel >= 2:2.0
 BuildRequires: libtool >= 2:2.0
 %{?with_userspace:BuildRequires:       linux-libc-headers >= 7:2.6.38.6}
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 Suggests:      kernel-net-ipset
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -131,8 +111,9 @@ Summary:    IPset kernel modules\
 Summary(pl.UTF-8):     Moduły jądra oferujące wsparcie dla zbiorów IP\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
-%{?with_dist_kernel:%requires_releq_kernel}\
 Requires(post,postun): /sbin/depmod\
+%requires_releq_kernel\
+Requires(postun):      %releq_kernel\
 \
 %description -n kernel%{_alt_kernel}-net-ipset\
 IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which\
@@ -187,7 +168,7 @@ for drv in kernel/net/netfilter/xt_*.ko ; do\
 done\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -202,7 +183,7 @@ done\
 %{__make}
 %endif
 
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT