From faa3761f9417788faab85bf6b1df76caf970391e Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Jul 22 2016 11:29:16 +0000
Subject: - /etc/ethertypes has been moved into the setup package. (RHBZ#1329256)


---

diff --git a/iptables.spec b/iptables.spec
index cea46d0..09bd16b 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -7,7 +7,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -36,6 +36,7 @@ BuildRequires: pkgconfig(libnftnl) >= 1.0.5
 # libpcap-devel for nfbpf_compile
 BuildRequires: libpcap-devel
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Conflicts: setup < 2.10.4-1
 
 %description
 The iptables utility controls the network packet filtering code in the
@@ -178,6 +179,9 @@ install -c -m 755 ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6tables
 install -m 755 iptables/iptables-apply %{buildroot}%{_sbindir}/
 install -m 644 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8/
 
+# Remove /etc/ethertypes (now part of setup)
+rm -f %{buildroot}%{_sysconfdir}/ethertypes
+
 %if 0%{?rhel}
 %pre
 for p in %{_sysconfdir}/alternatives/{iptables,ip6tables}.*; do
@@ -209,7 +213,6 @@ done
 %doc INCOMPATIBILITIES
 %config(noreplace) %{_sysconfdir}/sysconfig/iptables-config
 %config(noreplace) %{_sysconfdir}/sysconfig/ip6tables-config
-%{_sysconfdir}/ethertypes
 %{_sbindir}/iptables
 %{_sbindir}/iptables-apply
 %{_sbindir}/iptables-restore
@@ -277,6 +280,9 @@ done
 %{_sbindir}/xtables-compat-multi
 
 %changelog
+* Fri Jul 22 2016 Thomas Woerner <twoerner@redhat.com> - 1.6.0-2
+- /etc/ethertypes has been moved into the setup package. (RHBZ#1329256)
+
 * Wed Apr 13 2016 Thomas Woerner <twoerner@redhat.com> - 1.6.0-1
 - New upstream version 1.6.0 with nft-compat support and lots of fixes (RHBZ#1292990)
   Upstream changelog: