- release 18 (by relup.sh)

[packages/xtables-addons.git] / xtables-addons.spec

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 1ede88e8505f588f33c39242ce0a5a5e94c893f0..f58e2459c888f2c7e3fe4d73147a6bd0d2723790 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -19,7 +19,7 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     3
+%define                rel     18
 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
@@ -37,7 +37,7 @@ URL:          http://xtables-addons.sourceforge.net/
 Patch0:                %{name}-libs.patch
 Patch1:                %{name}-geoip-dbpath.patch
 Patch2:                kernelrelease.patch
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake
 BuildRequires: iptables-devel >= 1.4.3
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.25}
@@ -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,22 @@ 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}
+Conflicts:     xtables-geoip < 20090901-2
+# 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
@@ -106,7 +118,7 @@ export XA_TOPSRCDIR=$PWD
 %endif
 
 %if %{with userspace}
-%{__make} -C extensions
+%{__make}
 %endif
 
 %install
@@ -116,7 +128,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
 
@@ -124,11 +136,8 @@ cd ..
 %{__make} -C extensions install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cd extensions
-for m in $(cat .manpages.lst); do
-       install libxt_$m.man $RPM_BUILD_ROOT%{_mandir}/man8/libxt_$m.8
-done
-cd ..
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8
 %endif
 
 %clean
@@ -144,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
-%{_mandir}/man8/libxt_*.*
+%{_mandir}/man8/xtables-addons.8*
 %endif
 
 %if %{with kernel}