X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=ef5524967ea6d7d8d72605f0c12675f2d97e67ae;hp=89286deb599724e45de754bc6ad6df82296de7d1;hb=69b400eae2a2647519124fedc7ac10ff0427737b;hpb=261fd2864a30c67d42e295421543facfb4624672

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 89286de..ef55249 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -16,33 +16,34 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	18
+%define		rel	3
+%define		pname	xtables-addons
 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.39
+Name:		%{pname}%{_alt_kernel}
+Version:	1.42
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
-Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	63dedce9afd16acfd68efc30c9f55950
+Source0:	http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
+# Source0-md5:	7c996a0400667b57ab4fb53a013ae742
 URL:		http://xtables-addons.sourceforge.net/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	iptables-devel >= 1.4.3
+BuildRequires:	iptables-devel >= 1.4.5
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.29}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
-Requires:	iptables >= 1.4.3
+Requires:	iptables >= 1.4.5
 %if %{with ipset}
 Provides:	ipset = 6.7
 Obsoletes:	ipset
 %endif
 Obsoletes:	iptables-ipp2p
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
 %define		kpackage	kernel%{_alt_kernel}-net-xtables-addons = %{version}-%{rel}@%{_kernel_ver_str}
@@ -69,7 +70,7 @@ Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 # VERSION only dependency is intentional, for allowing multiple kernel pkgs and
 # single userspace package installs.
-Requires:	%{name} = %{version}
+Requires:	%{pname} = %{version}
 Suggests:	xtables-geoip
 Conflicts:	xtables-geoip < 20090901-2
 %{?with_dist_kernel:%requires_releq_kernel}
@@ -82,7 +83,7 @@ Kernel modules for xtables addons.
 Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 
 %if %{without ipset}
 %{__sed} -i -e 's#build_ipset6=m#build_ipset6=#' mconfig