rpms/iptables
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Made /etc/ethertypes provide and conflict for setup < 2.10.4-1 fedora version dependant

Browse Source
This commit is contained in:
Thomas Woerner 2016-07-22 13:45:10 +02:00
parent faa3761f94
commit 803e775de0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iptables.spec
View File

@ -36,7 +36,9 @@ BuildRequires: pkgconfig(libnftnl) >= 1.0.5
# libpcap-devel for nfbpf_compile # libpcap-devel for nfbpf_compile
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%if 0%{?fedora} > 24
Conflicts: setup < 2.10.4-1 Conflicts: setup < 2.10.4-1
%endif
%description %description
The iptables utility controls the network packet filtering code in the 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 755 iptables/iptables-apply %{buildroot}%{_sbindir}/
install -m 644 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8/ install -m 644 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8/
%if 0%{?fedora} > 24
# Remove /etc/ethertypes (now part of setup) # Remove /etc/ethertypes (now part of setup)
rm -f %{buildroot}%{_sysconfdir}/ethertypes rm -f %{buildroot}%{_sysconfdir}/ethertypes
%endif
%if 0%{?rhel} %if 0%{?rhel}
%pre %pre
@ -213,6 +217,9 @@ done
%doc INCOMPATIBILITIES %doc INCOMPATIBILITIES
%config(noreplace) %{_sysconfdir}/sysconfig/iptables-config %config(noreplace) %{_sysconfdir}/sysconfig/iptables-config
%config(noreplace) %{_sysconfdir}/sysconfig/ip6tables-config %config(noreplace) %{_sysconfdir}/sysconfig/ip6tables-config
%if 0%{?fedora} <= 24
%{_sysconfdir}/ethertypes
%endif
%{_sbindir}/iptables %{_sbindir}/iptables
%{_sbindir}/iptables-apply %{_sbindir}/iptables-apply
%{_sbindir}/iptables-restore %{_sbindir}/iptables-restore
@ -281,7 +288,8 @@ done
%changelog %changelog
* Fri Jul 22 2016 Thomas Woerner <twoerner@redhat.com> - 1.6.0-2 * Fri Jul 22 2016 Thomas Woerner <twoerner@redhat.com> - 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 <twoerner@redhat.com> - 1.6.0-1 * Wed Apr 13 2016 Thomas Woerner <twoerner@redhat.com> - 1.6.0-1
- New upstream version 1.6.0 with nft-compat support and lots of fixes (RHBZ#1292990) - New upstream version 1.6.0 with nft-compat support and lots of fixes (RHBZ#1292990)