From patchwork Tue Apr 30 15:08:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 163121 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3353373ill; Tue, 30 Apr 2019 08:10:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqyT0YZnZTCXgi+GS5ByfDoCsm3OIBZrNXr9a5UQJjPw8HxCaoQczINXV9gbFLH4v9FWFUZj X-Received: by 2002:a37:a954:: with SMTP id s81mr46777469qke.299.1556637000597; Tue, 30 Apr 2019 08:10:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556637000; cv=none; d=google.com; s=arc-20160816; b=ON7zy+RGTWS+299TPesKNFOA2Zdb0zGD5iche8zZA7MmR3wcNRrZhWSLuGmoIhSj5I TLvGTuzq0nRKtuIJZGR6dSg9+Xsk14htFH3LdBDmPA0XrV6NleLwG9am7A11lbKOOj5s 6jvRD7tcBxoXMRHDlA58cD3KgbVwgenNOlKpp8pQVgTyugXo+wLFG11/cksdTZo8t74s TT13dtD48QGtlWL2PByH2foKzBarSfVAiv4h5soIpniCxpZ0F3NDgRj2yQpyqrG5feX+ eOGFhJ54WYGc7zKfgqHjs0d4QV4XNqMr+3H/ixKHVcw66F8Ij1Sx8/8vb0ZvS2qapV47 MvnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:delivered-to; bh=8SToUdMuNKCFXL0sIb1jveoHDz6eNgIu4yZ7ywXd7cU=; b=xI1uEomCpqxeRIJlUv90ayOTs8DjwFL6IdWSzsNgfjh4vItNNX+XH2a9RFO1hBt6VJ XOV0euAFdaJR1kQcpguyH2vu68M2kplMsOEOs8hdtplLDbo6zrXLNhwNEdJqKIFwbcb9 lcwKa/eokFrWt0kGr3c8TOiNlFoJQ3+9oeQiK3rezD0lzw8fe1T67WXUPug6BnN8fWVG LpOKmMYZYy3B9zc6ifBU71I+7SX6dpYT11CWm4WE8nsCcnO/hAt4u7NP5dQt+e4xXJiX mOFaDLfYsH827UzyK71dUYTtSJU3OdnVZZbjZHtRznvrDW6407P5WMlPh81ErXPU7fSH Q85Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d21si321353qtd.189.2019.04.30.08.10.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Apr 2019 08:10:00 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB07C30842A1; Tue, 30 Apr 2019 15:09:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF0686D0A8; Tue, 30 Apr 2019 15:09:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 79CBE18089CC; Tue, 30 Apr 2019 15:09:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3UF8c4U022848 for ; Tue, 30 Apr 2019 11:08:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD1FF7D905; Tue, 30 Apr 2019 15:08:38 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.bos.redhat.com (dhcp-17-140.bos.redhat.com [10.18.17.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40A907C825; Tue, 30 Apr 2019 15:08:36 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 30 Apr 2019 11:08:06 -0400 Message-Id: <928ee40613b7fde3d54df7890949adce35553cc2.1556636871.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Yuval Turgeman , Laine Stump Subject: [libvirt] [PATCH] spec: fix f28 rpm without firewalld zone X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 30 Apr 2019 15:09:59 +0000 (UTC) Commit 3b71f2e42d added spec handling for with_firewalld_zone. We now call %firewalld_reload if with_firewalld is set. But the matching 'BuildRequires: firewalld-filesystem' is only applied if with_firewalld_zone is set. Fix the former bit to use with_firewalld_zone Reported-by: Yuval Turgeman Signed-off-by: Cole Robinson --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Laine Stump diff --git a/libvirt.spec.in b/libvirt.spec.in index 18f0a0e217..876b2f0897 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1387,12 +1387,12 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : %post daemon-driver-network -%if %{with_firewalld} +%if %{with_firewalld_zone} %firewalld_reload %endif %postun daemon-driver-network -%if %{with_firewalld} +%if %{with_firewalld_zone} %firewalld_reload %endif