- updated no_kernel patch, not it relies on with_kmod option

[packages/ipset.git] / ipset.spec

diff --git a/ipset.spec b/ipset.spec
index 48c4a1d56c961fbdbf9eac5624abd6c119528533..01e228373fcdc3fe87401afb3287251ac227f4ee 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,26 +20,26 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     9
+%define                rel     1
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.12.1
+Version:       6.20
 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: 80df500a4d93cb14e1373ae290716cda
+# Source0-md5: af28b3af356fff3e4a8e321ff7145678
 Source1:       %{pname}.init
 Patch0:                %{pname}-no_kernel.patch
-Patch1:                %{pname}-hash-net-if-fix.patch
 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
@@ -133,8 +133,7 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%{!?with_kernel:%patch0 -p1}
-%patch1 -p1
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -144,7 +143,9 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{__automake}
 %configure \
        --disable-silent-rules \
-       --with-kbuild=%{_kernelsrcdir}
+       --with-kbuild=%{_kernelsrcdir} \
+       %{!?with_kmod:--without-kmod} \
+       --with-settype-modules-list=all
 
 %if %{with userspace}
 %{__make}
@@ -169,11 +170,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
@@ -207,6 +209,7 @@ fi
 %attr(755,root,root) %{_libdir}/libipset.so
 %{_libdir}/libipset.la
 %{_includedir}/libipset
+%{_pkgconfigdir}/libipset.pc
 
 %files static
 %defattr(644,root,root,755)