From 803e775de09a6e01977d23abcefe86c75f757059 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Fri, 22 Jul 2016 13:45:10 +0200 Subject: [PATCH] Made /etc/ethertypes provide and conflict for setup < 2.10.4-1 fedora version dependant --- iptables.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/iptables.spec b/iptables.spec index 09bd16b..4dfec0a 100644 --- a/iptables.spec +++ b/iptables.spec @@ -36,7 +36,9 @@ BuildRequires: pkgconfig(libnftnl) >= 1.0.5 # libpcap-devel for nfbpf_compile BuildRequires: libpcap-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%if 0%{?fedora} > 24 Conflicts: setup < 2.10.4-1 +%endif %description The iptables utility controls the network packet filtering code in the @@ -179,8 +181,10 @@ 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/ +%if 0%{?fedora} > 24 # Remove /etc/ethertypes (now part of setup) rm -f %{buildroot}%{_sysconfdir}/ethertypes +%endif %if 0%{?rhel} %pre @@ -213,6 +217,9 @@ done %doc INCOMPATIBILITIES %config(noreplace) %{_sysconfdir}/sysconfig/iptables-config %config(noreplace) %{_sysconfdir}/sysconfig/ip6tables-config +%if 0%{?fedora} <= 24 +%{_sysconfdir}/ethertypes +%endif %{_sbindir}/iptables %{_sbindir}/iptables-apply %{_sbindir}/iptables-restore @@ -281,7 +288,8 @@ done %changelog * Fri Jul 22 2016 Thomas Woerner - 1.6.0-2 -- /etc/ethertypes has been moved into the setup package. (RHBZ#1329256) +- /etc/ethertypes has been moved into the setup package for F-25+. + (RHBZ#1329256) * Wed Apr 13 2016 Thomas Woerner - 1.6.0-1 - New upstream version 1.6.0 with nft-compat support and lots of fixes (RHBZ#1292990)