From 477a593f0bae374d8a6f268986b6df2565226cbd Mon Sep 17 00:00:00 2001
From: jpzhang <jpzhang187@163.com>
Date: Fri, 4 Sep 2020 15:06:58 +0800
Subject: [PATCH] Delete files that conflict with the ebtables package

---
 iptables.spec | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/iptables.spec b/iptables.spec
index aff4d10..5b7e25f 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -2,7 +2,7 @@
 %global legacy_actions %{_libexecdir}/initscripts/legacy-actions
 Name:		  iptables
 Version:	  1.8.5
-Release:	  1
+Release:	  2
 Summary:	  IP packet filter administration utilities
 License:	  GPLv2 and Artistic Licence 2.0 and ISC
 URL:		  https://www.netfilter.org/
@@ -174,22 +174,6 @@ pfx6=%{_sbindir}/ip6tables
 	--slave $pfx6-restore ip6tables-restore $pfx6-nft-restore \
 	--slave $pfx6-save ip6tables-save $pfx6-nft-save
 
-pfx=%{_sbindir}/ebtables
-manpfx=%{_mandir}/man8/ebtables
-for sfx in "" "-restore" "-save"; do
-	if [ "$(readlink -e $pfx$sfx)" == $pfx$sfx ]; then
-		rm -f $pfx$sfx
-	fi
-done
-if [ "$(readlink -e $manpfx.8.gz)" == $manpfx.8.gz ]; then
-	rm -f $manpfx.8.gz
-fi
-%{_sbindir}/update-alternatives --install \
-	$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
-
 pfx=%{_sbindir}/arptables
 manpfx=%{_mandir}/man8/arptables
 lepfx=%{_libexecdir}/arptables
@@ -280,6 +264,9 @@ fi
 %{_sbindir}/arptables-nft*
 %{_sbindir}/xtables-nft-multi
 %{_sbindir}/xtables-monitor
+%exclude %{_sbindir}/ebtables
+%exclude %{_sbindir}/ebtables-restore
+%exclude %{_sbindir}/ebtables-save
 %dir %{_libdir}/xtables
 %{_libdir}/xtables/libarpt*
 %{_libdir}/xtables/libebt*
@@ -289,9 +276,6 @@ fi
 %ghost %{_sbindir}/ip6tables
 %ghost %{_sbindir}/ip6tables-restore
 %ghost %{_sbindir}/ip6tables-save
-%ghost %{_sbindir}/ebtables
-%ghost %{_sbindir}/ebtables-save
-%ghost %{_sbindir}/ebtables-restore
 %ghost %{_sbindir}/arptables
 %ghost %{_sbindir}/arptables-save
 %ghost %{_sbindir}/arptables-restore
@@ -315,6 +299,12 @@ fi
 %{_mandir}/man8/xtables-legacy*
 
 %changelog
+* Fri Sep 04 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.8.5-2
+- Type bugfix
+- ID: NA
+- SUG: NA
+- Delete files that conflict with the ebtables package
+
 * Wed Aug 26 yuboyun <yuboyun@huawei.com> - 1.8.5-1
 - Type: bugfix
 - ID: NA
-- 
Gitee