- up to 1.25

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 432730349fa1ca67a6a92893dbf5f4e0f3ee9a71..bb2dcf0d64e5d64e64007bc599f940bbad372e54 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,6 +1,13 @@
-#
 # TODO
 # - descriptions
+# - package referenec implementation iptaccount(8) and userspace lib
+#   /usr/lib64/libxt_ACCOUNT_cl.la
+#   /usr/lib64/libxt_ACCOUNT_cl.so
+#   /usr/lib64/libxt_ACCOUNT_cl.so.0
+#   /usr/lib64/libxt_ACCOUNT_cl.so.0.0.0
+#   /usr/sbin/iptaccount
+#   and if packaged can remove debuginfo package omit
+# - subpackage for geoip due extra deps
 #
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
@@ -19,7 +26,7 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     11
+%define                rel     0.1
 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
@@ -27,16 +34,14 @@ Summary(ru.UTF-8):  Утилиты для управления пакетными
 Summary(uk.UTF-8):     Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          xtables-addons
-Version:       1.18
+Version:       1.25
 Release:       %{rel}
 License:       GPL
 Group:         Networking/Admin
-Source0:       http://dl.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
-# Source0-md5: 5a8d2edbf5a3470bba58d6a60c350805
+Source0:       http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
+# Source0-md5: d2765d1e6be6194b2c24efa6684a6874
 URL:           http://xtables-addons.sourceforge.net/
-Patch0:                %{name}-libs.patch
-Patch1:                %{name}-geoip-dbpath.patch
-Patch2:                kernelrelease.patch
+Patch0:                kernelrelease.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: iptables-devel >= 1.4.3
@@ -81,6 +86,7 @@ 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
+Conflicts:     xtables-geoip < 20090901-2
 # VERSION only dependency is intentional, for allowing multiple kernel pkgs and
 # single userspace package installs.
 Requires:      %{name} = %{version}
@@ -96,8 +102,6 @@ Moduły jądra dla xtables addons.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
 
@@ -107,17 +111,15 @@ Moduły jądra dla xtables addons.
 %{__autoconf}
 %{__automake}
 %configure \
-       --with-kbuild=%{_kernelsrcdir} \
-       --with-ksource=%{_kernelsrcdir}
-
-export XA_TOPSRCDIR=$PWD
+       --with-kbuild=no
 
 %if %{with kernel}
-%build_kernel_modules -C extensions -m compat_xtables
+srcdir=${PWD:-$(pwd)}
+%build_kernel_modules XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
 %endif
 
 %if %{with userspace}
-%{__make} -C extensions
+%{__make}
 %endif
 
 %install
@@ -135,11 +137,8 @@ cd ..
 %{__make} -C extensions install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cd extensions
-for m in $(cat .manpages.lst); do
-       cp -a 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
@@ -155,7 +154,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}