From c702c77a57692cc582c03cf3557dca4958e17c74 Mon Sep 17 00:00:00 2001 From: XWwalker Date: Fri, 1 Jul 2022 11:40:14 +0800 Subject: [PATCH] /etc/ethertypes has been moved into the setup package --- iptables.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/iptables.spec b/iptables.spec index 56b98a5..cd895aa 100644 --- a/iptables.spec +++ b/iptables.spec @@ -2,7 +2,7 @@ %global legacy_actions %{_libexecdir}/initscripts/legacy-actions Name: iptables Version: 1.8.7 -Release: 7 +Release: 8 Summary: IP packet filter administration utilities License: GPLv2 and Artistic Licence 2.0 and ISC URL: https://www.netfilter.org/ @@ -21,6 +21,7 @@ BuildRequires: libmnl-devel libnetfilter_conntrack-devel libnfnetlink-devel l BuildRequires: autogen autoconf automake libtool Requires: %{name}-libs = %{version}-%{release} +Conflicts: setup < 2.10.4-1 Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -132,6 +133,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 @@ -234,7 +238,6 @@ fi %defattr(-,root,root) %license COPYING %{script_path}/ip*tables.init -%{_sysconfdir}/ethertypes %config(noreplace) %{_sysconfdir}/sysconfig/* %{_sbindir}/nfnl_osf %{_sbindir}/nfbpf_* @@ -317,6 +320,12 @@ fi %{_mandir}/man8/xtables-legacy* %changelog +* Fri Jul 01 2022 xingwei - 1.8.7-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:/etc/ethertypes has been moved into the setup package + * Wed Apr 06 2022 chenzhen - 1.8.7-7 - Type:Enhancement - ID:NA -- Gitee