Re: [libvirt] [PATCH] Don't require iptables-ipv6 on >= F17 and RHEL >= 7

On 07/08/2014 05:34 AM, Ján Tomko wrote: > We only need ip6tables, which is now a part of the iptables package: > http://pkgs.fedoraproject.org/cgit/iptables.git/commit/?h=1392835 > > This needlessly pulls in iptables-services: > https://bugzilla.redhat.com/show_bug.cgi?id=1101510 > which can conflict with firewalld: > https://bugzilla.redhat.com/show_bug.cgi?id=1101484 > --- > libvirt.spec.in | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/libvirt.spec.in b/libvirt.spec.in > index 8802746..ba6054c 100644 > --- a/libvirt.spec.in > +++ b/libvirt.spec.in > @@ -522,7 +522,9 @@ BuildRequires: libapparmor-devel > %if %{with_network} > BuildRequires: dnsmasq >= 2.41 > BuildRequires: iptables > + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 Won't work like this. This blindly requires the package on non-Fedora, non-RHEL systems (such as SUSE). It must be: %if (0%{?fedora} && 0%{?fedora} < 17) || (0%{?rhel} && 0{?rhel} < 7) (look at how libgcrypt-devel is required, for an example) > @@ -766,7 +768,9 @@ Requires: libvirt-daemon = %{version}-%{release} > Requires: dnsmasq >= 2.41 > Requires: radvd > Requires: iptables > + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 > Requires: iptables-ipv6 > + %endif here too. > > %description daemon-driver-network > The network driver plugin for the libvirtd daemon, providing > @@ -781,7 +785,9 @@ Summary: Nwfilter driver plugin for the libvirtd daemon > Group: Development/Libraries > Requires: libvirt-daemon = %{version}-%{release} > Requires: iptables > + %if 0%{?fedora} < 17 && 0%{?rhel} < 7 > Requires: iptables-ipv6 > + %endif And here. ACK with those three changes.