- updated to 3.26

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

diff --git a/xtables-addons.spec b/xtables-addons.spec
index cf5538ec419c50dde6ad7707d952ad4cec180138..3f34ffb03ee3bb51aaa0f55657c1ff31d6260203 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -3,8 +3,8 @@
 #                 xtables-addons 2.0 (XTADDONS_2 branch) support kernels 3.7 - 4.14
 #
 # Conditional build:
-%bcond_without kernel          # don't build kernel modules
-%bcond_without userspace       # don't build userspace tools
+%bcond_without kernel          # kernel modules
+%bcond_without userspace       # userspace tools
 %bcond_with    verbose         # verbose build (V=1)
 
 # The goal here is to have main, userspace, package built once with
@@ -26,24 +26,24 @@ exit 1
 Summary:       Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):     Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       3.11
+Version:       3.26
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       https://inai.de/files/xtables-addons/%{pname}-%{version}.tar.xz
-# Source0-md5: 7d338d0afb236eea377bcc951492f48a
+# Source0-md5: afcec8d977631d224eaf87b27d51e77d
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
 BuildRequires: iptables-devel >= 1.6.0
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:4.18.0}}
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: rpmbuild(macros) >= 1.746
 BuildRequires: tar >= 1.22
 BuildRequires: xz
 Requires:      iptables >= 1.6.0
-Obsoletes:     iptables-ipp2p
+Obsoletes:     iptables-ipp2p < 0.8.3
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 %define                _duplicate_files_terminate_build        0
@@ -144,7 +144,7 @@ EOF
 %if %{with userspace}
 %{__make} -C extensions install \
        DESTDIR=$RPM_BUILD_ROOT
-%{__make} install-man \
+%{__make} install-exec-am install-man \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libxt_ACCOUNT_cl.{la,so}
@@ -159,12 +159,29 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README doc/{README.psd,changelog.txt}
+%doc README.rst doc/{README.psd,changelog.rst}
+%attr(755,root,root) %{_bindir}/xt_geoip_query
 %attr(755,root,root) %{_sbindir}/iptaccount
 %attr(755,root,root) %{_sbindir}/pknlusr
 %attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.0
+%attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.1
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
+%dir %{_libexecdir}/xtables-addons
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_asn_build
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_asn_dl
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_asn_fetch
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_geoip_build
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_geoip_build_maxmind
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_geoip_dl
+%attr(755,root,root) %{_libexecdir}/xtables-addons/xt_geoip_dl_maxmind
+%{_mandir}/man1/xt_asn_build.1*
+%{_mandir}/man1/xt_asn_dl.1*
+%{_mandir}/man1/xt_geoip_build.1*
+%{_mandir}/man1/xt_geoip_build_maxmind.1*
+%{_mandir}/man1/xt_geoip_dl.1*
+%{_mandir}/man1/xt_geoip_dl_maxmind.1*
+%{_mandir}/man1/xt_geoip_query.1*
 %{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
+%{_mandir}/man8/pknlusr.8*
 %endif