From c5b122e9a76da1c30317081c4ea516ec827a50f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 29 Oct 2013 13:47:58 +0100 Subject: [PATCH] - updated kernel build macro magic - rel 2 --- ipset.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ipset.spec b/ipset.spec index 6953529..ab244a0 100644 --- a/ipset.spec +++ b/ipset.spec @@ -38,16 +38,17 @@ exit 1 %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 rel 2 %define pname ipset Summary: IP sets utility Summary(pl.UTF-8): Narzędzie do zarządzania zbiorami IP -Name: %{pname}%{_alt_kernel} +Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} Version: 6.20.1 -Release: %{rel}%{?with_kernel:@%{_kernel_ver_str}} +Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Networking/Admin #Source0Download: http://ipset.netfilter.org/install.html @@ -57,13 +58,13 @@ Source1: %{pname}.init URL: http://ipset.netfilter.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake -%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.38.6} BuildRequires: libmnl-devel >= 1 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}} Suggests: kernel-net-ipset BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -- 2.44.0