From c92b9d3896369ee992f643e2a2c5d2b1c824fefb Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Thu, 16 Jan 2020 12:40:33 +0100
Subject: [PATCH] iptables-1.8.4-5

- Raise Alternatives priority of nft variants to match legacy ones
- Add Provides lines to allow for iptables-nft as full legacy alternative
---
 iptables.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/iptables.spec b/iptables.spec
index c0ffb8a..82db381 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -19,7 +19,7 @@ Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 URL: http://www.netfilter.org/projects/iptables
 Version: 1.8.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: %{url}/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -122,6 +122,9 @@ Summary: nftables compatibility for iptables, arptables and ebtables
 Requires: %{name} = %{version}-%{release}
 Obsoletes: iptables-compat < 1.6.2-4
 Provides: arptables-helper
+Provides: iptables
+Provides: arptables
+Provides: ebtables
 
 %description nft
 nftables compatibility for iptables, arptables and ebtables.
@@ -175,7 +178,7 @@ popd
 	-name 'libip*tc.so.%{iptc_so_ver_old}*' -delete -print
 %endif
 
-make install DESTDIR=%{buildroot} 
+make install DESTDIR=%{buildroot}
 # remove la file(s)
 rm -f %{buildroot}/%{_libdir}/*.la
 
@@ -277,7 +280,7 @@ fi
 pfx=%{_sbindir}/iptables
 pfx6=%{_sbindir}/ip6tables
 %{_sbindir}/update-alternatives --install \
-	$pfx iptables $pfx-nft 5 \
+	$pfx iptables $pfx-nft 10 \
 	--slave $pfx6 ip6tables $pfx6-nft \
 	--slave $pfx-restore iptables-restore $pfx-nft-restore \
 	--slave $pfx-save iptables-save $pfx-nft-save \
@@ -295,7 +298,7 @@ if [ "$(readlink -e $manpfx.8.gz)" == $manpfx.8.gz ]; then
 	rm -f $manpfx.8.gz
 fi
 %{_sbindir}/update-alternatives --install \
-	$pfx ebtables $pfx-nft 5 \
+	$pfx ebtables $pfx-nft 10 \
 	--slave $pfx-save ebtables-save $pfx-nft-save \
 	--slave $pfx-restore ebtables-restore $pfx-nft-restore \
 	--slave $manpfx.8.gz ebtables-man $manpfx-nft.8.gz
@@ -315,7 +318,7 @@ if [ "$(readlink -e $lepfx-helper)" == $lepfx-helper ]; then
 	rm -f $lepfx-helper
 fi
 %{_sbindir}/update-alternatives --install \
-	$pfx arptables $pfx-nft 5 \
+	$pfx arptables $pfx-nft 10 \
 	--slave $pfx-save arptables-save $pfx-nft-save \
 	--slave $pfx-restore arptables-restore $pfx-nft-restore \
 	--slave $manpfx.8.gz arptables-man $manpfx-nft.8.gz \
@@ -443,6 +446,10 @@ fi
 
 
 %changelog
+* Wed Jan 15 2020 Phil Sutter <psutter@redhat.com> - 1.8.4-5
+- Raise Alternatives priority of nft variants to match legacy ones
+- Add Provides lines to allow for iptables-nft as full legacy alternative
+
 * Thu Dec 19 2019 Phil Sutter <psutter@redhat.com> - 1.8.4-4
 - Drop leftover include in arptables-nft-helper