- /etc/ethertypes has been moved into the setup package. (RHBZ#1329256)

ebtables.spec

@@ -2,7 +2,7 @@
 
 Name:			ebtables
 Version:		2.0.10
-Release:		20%{?dist}
+Release:		21%{?dist}
 Summary:		Ethernet Bridge frame table administration tool
 License:		GPLv2+
 Group:			System Environment/Base
@@ -24,6 +24,7 @@ BuildRequires:		systemd-units
 Requires(post):		systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
+Conflicts:              setup < 2.10.4-1
 
 %description
 Ethernet bridge tables is a firewalling tool to transparently filter network
@@ -76,6 +77,9 @@ install %{SOURCE1} %{buildroot}/sbin/ebtables-save
 # move libebtc.so into the ldpath
 mv %{buildroot}/%{_lib}/ebtables/libebtc.so %{buildroot}/%{_lib}/
 
+# Remove /etc/ethertypes (now part of setup)
+rm -f %{buildroot}%{_sysconfdir}/ethertypes
+
 %post
 %systemd_post ebtables.service
 /sbin/ldconfig
@@ -90,7 +94,6 @@ mv %{buildroot}/%{_lib}/ebtables/libebtc.so %{buildroot}/%{_lib}/
 %files
 %doc ChangeLog COPYING THANKS
 %doc %{_mandir}/man8/ebtables.8*
-%config(noreplace) %{_sysconfdir}/ethertypes
 %config(noreplace) %{_sysconfdir}/sysconfig/ebtables-config
 %{_unitdir}/ebtables.service
 %{_libexecdir}/ebtables
@@ -102,6 +105,9 @@ mv %{buildroot}/%{_lib}/ebtables/libebtc.so %{buildroot}/%{_lib}/
 %ghost %{_sysconfdir}/sysconfig/ebtables.broute
 
 %changelog
+* Fri Jul 22 2016 Thomas Woerner <twoerner@redhat.com> - 2.0.10-21
+- /etc/ethertypes has been moved into the setup package. (RHBZ#1329256)
+
 * Mon May  9 2016 Thomas Woerner <twoerner@redhat.com> - 2.0.10-20
 - add upstream --noflush option patch for ebtables-restore