/etc/ethertypes has been moved into the setup package

(cherry picked from commit 3ef1b5602bfbce6118fd1f4a12b47927cb342c13)

iptables.spec

@@ -2,7 +2,7 @@
 %global legacy_actions %{_libexecdir}/initscripts/legacy-actions
 Name:		  iptables
 Version:	  1.8.5
-Release:	  2
+Release:	  3
 Summary:	  IP packet filter administration utilities
 License:	  GPLv2 and Artistic Licence 2.0 and ISC
 URL:		  https://www.netfilter.org/
@@ -18,6 +18,7 @@ BuildRequires:    libmnl-devel libnetfilter_conntrack-devel libnfnetlink-devel l
 BuildRequires:    autogen autoconf automake libtool iptables
 
 Requires:         %{name}-libs = %{version}-%{release} %{name}-help
+Conflicts:	  setup < 2.10.4-1
 
 Requires(post):   %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
@@ -129,6 +130,9 @@ install -m 0755 -c ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6table
 install -m 0755 iptables/iptables-apply %{buildroot}%{_sbindir}
 install -m 0755 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8
 
+# Remove /etc/ethertypes (now part of setup)
+rm -f %{buildroot}%{_sysconfdir}/ethertypes
+
 touch %{buildroot}%{_libexecdir}/arptables-helper
 
 touch %{buildroot}%{_mandir}/man8/arptables.8
@@ -232,7 +236,6 @@ fi
 %defattr(-,root,root)
 %license COPYING
 %{script_path}/ip*tables.init
-%{_sysconfdir}/ethertypes
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 %{_sbindir}/nfnl_osf
 %{_sbindir}/nfbpf_*
@@ -315,6 +318,12 @@ fi
 %{_mandir}/man8/xtables-legacy*
 
 %changelog
+* Thu Jun 30 2022 xingwei <xingwei14@h-partners.com> - 1.8.5-3
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: /etc/ethertypes has been moved into the setup package
+
 * Mon Nov 09 2020 quanhongfei <quanhongfei@huawei.com> - 1.8.5-2
 - Type: requirement
 - ID: NA