X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=18512f1d507c654c69e0f273986efbe3120a1c88;hp=db4b8318744deb186f02eaf7b679a79266d0784d;hb=8263fc3098946308596e33f430445921de380ec7;hpb=16932b07eeba5c77f1b50373f1d51737fc515e28

diff --git a/xtables-addons.spec b/xtables-addons.spec
index db4b831..18512f1 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -16,19 +16,18 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	3
+%define		rel	22
 Summary:	Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):	Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
 Name:		xtables-addons
-Version:	1.38
+Version:	1.39
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	6a69e9931e2392348c8674af1f2fc056
-Patch0:		%{name}-build.patch
+# Source0-md5:	63dedce9afd16acfd68efc30c9f55950
 URL:		http://xtables-addons.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	iptables-devel >= 1.4.3
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.29}
@@ -42,6 +41,7 @@ Requires:	iptables >= 1.4.3
 Provides:	ipset = 6.7
 Obsoletes:	ipset
 %endif
+Obsoletes:	iptables-ipp2p
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
@@ -83,7 +83,6 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if %{without ipset}
 %{__sed} -i -e 's#build_ipset6=m#build_ipset6=#' mconfig
@@ -157,7 +156,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README doc/{README.psd,changelog.txt}
-%attr(755,root,root) %{_sbindir}/ipset
 %attr(755,root,root) %{_sbindir}/iptaccount
 %attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.0
@@ -165,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
 %if %{with ipset}
+%attr(755,root,root) %{_sbindir}/ipset
 %attr(755,root,root) %{_libdir}/libipset.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libipset.so.1
 %{_mandir}/man8/ipset.8*