X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=432730349fa1ca67a6a92893dbf5f4e0f3ee9a71;hp=2b2a7256dce552fe3c6c341a21c8dba512770265;hb=d44b45ea58f552ad644786a9aa923f870e92b5bb;hpb=a3a22ac5abbe41ea73a78eed6bc5a51d7af11252

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 2b2a725..4327303 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -19,7 +19,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	5
+%define		rel	11
 Summary:	Extensible packet filtering system && extensible NAT system
 Summary(pl.UTF-8):	System filtrowania pakietów oraz system translacji adresów (NAT)
 Summary(pt_BR.UTF-8):	Ferramenta para controlar a filtragem de pacotes no kernel-2.6.x
@@ -47,10 +47,15 @@ BuildRequires:	rpmbuild(macros) >= 1.379
 Requires:	iptables >= 1.4.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# use macro, so adapter won't try to wrap
+%define		kpackage	kernel%{_alt_kernel}-net-xtables-addons = %{rel}@%{_kernel_ver_str}
+
 %description
 An extensible NAT system, and an extensible packet filtering system.
 Replacement of ipchains in 2.6 and higher kernels.
 
+You need %{kpackage} installed for the tools to work.
+
 %description -l pl.UTF-8
 Wydajny system translacji adresów (NAT) oraz system filtrowania
 pakietów. Zamiennik ipchains w jądrach 2.6 i nowszych.
@@ -72,15 +77,21 @@ Linux. Вони дозволяють вам встановлювати міжм
 (firewalls) та IP маскарадинг, тощо.
 
 %package -n kernel%{_alt_kernel}-net-xtables-addons
-Summary:	-
-Summary(pl.UTF-8):	-
-Release:	%{release}@%{_kernel_ver_str}
+Summary:	Kernel modules for xtables addons
+Summary(pl.UTF-8):	Moudły jądra dla xtables addons
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Requires:	%{name} = %{version}-%{rel}
+# VERSION only dependency is intentional, for allowing multiple kernel pkgs and
+# single userspace package installs.
+Requires:	%{name} = %{version}
 %{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 
 %description -n kernel%{_alt_kernel}-net-xtables-addons
+Kernel modules for xtables addons.
+
+%description -n kernel%{_alt_kernel}-net-xtables-addons -l pl.UTF-8
+Moduły jądra dla xtables addons.
 
 %prep
 %setup -q
@@ -116,7 +127,7 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/lib/modules/%{_kernel_ver}/kernel/n
 %if %{with kernel}
 cd extensions
 %install_kernel_modules -m compat_xtables -d kernel/net/netfilter
-install xt_*ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
+install -p xt_*ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
 cd ..
 %endif
 
@@ -126,7 +137,7 @@ cd ..
 
 cd extensions
 for m in $(cat .manpages.lst); do
-	install libxt_$m.man $RPM_BUILD_ROOT%{_mandir}/man8/libxt_$m.8
+	cp -a libxt_$m.man $RPM_BUILD_ROOT%{_mandir}/man8/libxt_$m.8
 done
 cd ..
 %endif