[packages/ipset] - use rpm macro to install kernel modules - rel 16

baggins baggins at pld-linux.org
Sat Apr 13 21:44:46 CEST 2013


commit fe0acc21ff767d81179bf8e6f238f54efb859e0f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 13 21:44:30 2013 +0200

    - use rpm macro to install kernel modules
    - rel 16

 ipset.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/ipset.spec b/ipset.spec
index d6aacf6..cfda104 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,7 +20,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	15
+%define		rel	16
 %define		pname	ipset
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
@@ -169,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 xt_*.ko ; do
+%install_kernel_modules -m ${drv%.ko} -d kernel/net/ipv4/netfilter
+done
 %endif
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ipset.git/commitdiff/fe0acc21ff767d81179bf8e6f238f54efb859e0f



More information about the pld-cvs-commit mailing list