- 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 b492a805c0d0c8105a38755e2e684f5d2ab1f7a4..01e228373fcdc3fe87401afb3287251ac227f4ee 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,18 +20,18 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     14
+%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.19
+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: cabba1bd63a93f6e1c3db3fb22412b64
+# Source0-md5: af28b3af356fff3e4a8e321ff7145678
 Source1:       %{pname}.init
 Patch0:                %{pname}-no_kernel.patch
 URL:           http://ipset.netfilter.org/
@@ -133,7 +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}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -143,8 +143,9 @@ 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}
+       --with-kbuild=%{_kernelsrcdir} \
+       %{!?with_kmod:--without-kmod} \
+       --with-settype-modules-list=all
 
 %if %{with userspace}
 %{__make}
@@ -200,7 +201,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.3
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.2
 %{_mandir}/man8/ipset.8*
 
 %files devel
@@ -208,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)