- rebuild for kernel-3.10.11-1

[packages/ipset.git] / ipset.spec

diff --git a/ipset.spec b/ipset.spec
index 6bb4d01032ba7d3058e36105cd14ca8469728ef9..b4b89be219e994157eea2f5257c3a60b880e65d1 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,27 +20,27 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     19
+%define                rel     11
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.9.1
+Version:       6.19
 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: 71f4b826e025be5918a52e9843673167
+# Source0-md5: cabba1bd63a93f6e1c3db3fb22412b64
 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
-BuildRequires: libtool
+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.583
@@ -70,7 +70,7 @@ Summary:      Header files for ipset interface
 Summary(pl.UTF-8):     Pliki nagłówkowe do interfejsu ipset
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libmnl-devel
+Requires:      libmnl-devel >= 1
 
 %description devel
 Header files for IPset interface.
@@ -134,7 +134,6 @@ 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
 
 %build
 %{__libtoolize}
@@ -143,6 +142,8 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{__autoheader}
 %{__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
@@ -198,7 +200,7 @@ fi
 %doc ChangeLog ChangeLog.ippool README UPGRADE
 %attr(755,root,root) %{_sbindir}/ipset
 %attr(755,root,root) %{_libdir}/libipset.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.1
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.3
 %{_mandir}/man8/ipset.8*
 
 %files devel