X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=ipset.spec;h=033edd149ec789c2c63d30072ae7b1cfa495f61a;hb=e0cf1c3285dc6954491703f1addbeff2e3bd81ec;hp=ccadcbd0efcfacb480b7617b5c178aff2d30d881;hpb=f6c45fdefcfc73fd8e9480cbaa8f67a5f7446fe8;p=packages%2Fipset.git

diff --git a/ipset.spec b/ipset.spec
index ccadcbd..033edd1 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,27 +20,29 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	5
+%define		rel	8
 %define		pname	ipset
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
 Name:		%{pname}%{_alt_kernel}
-Version:	6.3
+Version:	6.16.1
 Release:	%{rel}
-License:	GPL
+License:	GPL v2
 Group:		Networking/Admin
+#Source0Download: http://ipset.netfilter.org/install.html
 Source0:	http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5:	8830f555133695d455a7aa5d7b5019ea
+# Source0-md5:	9fd70c825f052db7dc9d5ba0562b7083
 Source1:	%{pname}.init
-Patch0:		%{pname}-config_dist.patch
-Patch1:		%{pname}-no_kernel.patch
+Patch0:		%{pname}-no_kernel.patch
 URL:		http://ipset.netfilter.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.34}
-BuildRequires:	libmnl-devel
-BuildRequires:	libtool
-%{?with_userspace:BuildRequires:	linux-libc-headers >= 7:2.6.34}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.38.6}
+BuildRequires:	libmnl-devel >= 1
+BuildRequires:	libltdl-devel
+BuildRequires:	libtool >= 2:2.0
+%{?with_userspace:BuildRequires:	linux-libc-headers >= 7:2.6.38.6}
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.583
 Suggests:	kernel-net-ipset
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,6 +69,8 @@ zbioru.
 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 >= 1
 
 %description devel
 Header files for IPset interface.
@@ -129,11 +133,7 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%if %{with kernel}
-%{?with_dist_kernel:%patch0 -p1}
-%else
-%patch1 -p1
-%endif
+%{!?with_kernel:%patch0 -p1}
 
 %build
 %{__libtoolize}
@@ -142,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}
@@ -196,15 +198,15 @@ fi
 %defattr(644,root,root,755)
 %doc ChangeLog ChangeLog.ippool README UPGRADE
 %attr(755,root,root) %{_sbindir}/ipset
-%attr(755,root,root) %{_libdir}/libipset.so.1.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.1
+%attr(755,root,root) %{_libdir}/libipset.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.3
 %{_mandir}/man8/ipset.8*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/libipset
-%{_libdir}/libipset.la
 %attr(755,root,root) %{_libdir}/libipset.so
+%{_libdir}/libipset.la
+%{_includedir}/libipset
 
 %files static
 %defattr(644,root,root,755)