diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec index 464057c..afbe1e4 100644 --- a/SPECS/iptables.spec +++ b/SPECS/iptables.spec @@ -91,7 +91,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gcc BuildRequires: pkgconfig(libmnl) >= 1.0 -BuildRequires: pkgconfig(libnftnl) >= 1.1.1-4 +BuildRequires: pkgconfig(libnftnl) >= 1.1 # libpcap-devel for nfbpf_compile BuildRequires: libpcap-devel BuildRequires: autoconf @@ -279,18 +279,17 @@ install -m 644 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8/ rm -f %{buildroot}%{_sysconfdir}/ethertypes %endif -# drop all legacy tools -rm -f %{buildroot}%{_sbindir}/*legacy* +# drop legacy stuff we don't need rm -f %{buildroot}%{_bindir}/iptables-xml rm -f %{buildroot}%{_mandir}/man1/iptables-xml* rm -f %{buildroot}%{_mandir}/man8/xtables-legacy* -# rename nft versions to standard name +# rename legacy iptable versions to standard name pfx=%{buildroot}%{_sbindir}/iptables -for pfx in %{buildroot}%{_sbindir}/{iptables,ip6tables,arptables,ebtables}; do - mv $pfx-nft $pfx - mv $pfx-nft-restore $pfx-restore - mv $pfx-nft-save $pfx-save +for pfx in %{buildroot}%{_sbindir}/{iptables,ip6tables}; do + mv $pfx-legacy $pfx + mv $pfx-legacy-restore $pfx-restore + mv $pfx-legacy-save $pfx-save done # extra sources for arptables @@ -380,6 +379,15 @@ done %{_mandir}/man8/xtables-monitor* %{_mandir}/man8/xtables-nft* %{_mandir}/man8/xtables-translate* + +%{_sbindir}/xtables-legacy-multi +%{_sbindir}/ip6tables-nft +%{_sbindir}/ip6tables-nft-restore +%{_sbindir}/ip6tables-nft-save +%{_sbindir}/iptables-nft +%{_sbindir}/iptables-nft-restore +%{_sbindir}/iptables-nft-save + %dir %{_libdir}/xtables %{_libdir}/xtables/libarpt* %{_libdir}/xtables/libebt*