diff --git a/ebtables.changes b/ebtables.changes index a90d28f..87698aa 100644 --- a/ebtables.changes +++ b/ebtables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 22 16:22:33 UTC 2018 - matthias.gerstner@suse.com + +- Resolve conflict with iptables-nft and obtain ethertypes from new netcfg + minor version. FATE#320520 + ------------------------------------------------------------------- Thu Nov 23 13:37:47 UTC 2017 - rbrown@suse.com diff --git a/ebtables.spec b/ebtables.spec index ad54c07..ea36772 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -1,7 +1,7 @@ # # spec file for package ebtables # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,7 @@ BuildRequires: linux-glibc-devel >= 2.6.20 BuildRequires: sed BuildRequires: systemd-rpm-macros BuildRequires: xz +Requires: netcfg >= 11.6 Requires(pre): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -128,12 +129,13 @@ rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config" %defattr(-,root,root) %doc COPYING ChangeLog %{_mandir}/man8/ebtables.8* -%config(noreplace) %{_sysconfdir}/ethertypes %{_libexecdir}/%{name} %{_unitdir}/%{name}.service %ghost %{_fillupdir}/sysconfig.%{name}.filter %ghost %{_fillupdir}/sysconfig.%{name}.nat %ghost %{_fillupdir}/sysconfig.%{name}.broute +# is provided by the netcfg package +%ghost %{_sysconfdir}/ethertypes %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_sbindir}/ebtables