- fix module install

[packages/ipset.git] / ipset.spec

diff --git a/ipset.spec b/ipset.spec
index 5ae3216c5c2788dc0d493bdef40bcdc8773772d5..452d7d8a1191947a53416b299b535b4df3e67614 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,18 +20,18 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     8
+%define                rel     17
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.14
+Version:       6.16.1
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
 #Source0Download: http://ipset.netfilter.org/install.html
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: 70f2d4c054592236dcda285855a4ee58
+# Source0-md5: 9fd70c825f052db7dc9d5ba0562b7083
 Source1:       %{pname}.init
 Patch0:                %{pname}-no_kernel.patch
 URL:           http://ipset.netfilter.org/
@@ -143,6 +143,7 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{__automake}
 %configure \
        --disable-silent-rules \
+       -with-settype-modules-list=all \
        --with-kbuild=%{_kernelsrcdir}
 
 %if %{with userspace}
@@ -168,11 +169,12 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname}
 %endif
 
 %if %{with kernel}
-cd kernel/net/netfilter
-%install_kernel_modules -m ipset/ip_set -d kernel/net/ipv4/netfilter/ipset
-install -p ipset/ip_set_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipset
-install -p xt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter
-cd -
+for drv in kernel/net/netfilter/ipset/ip_set*.ko ; do
+%install_kernel_modules -m ${drv%.ko} -d kernel/net/ipv4/netfilter/ipset
+done
+for drv in kernel/net/netfilter/xt_*.ko ; do
+%install_kernel_modules -m ${drv%.ko} -d kernel/net/ipv4/netfilter
+done
 %endif
 
 %clean