Re: [libvirt] [PATCH 1/2] spec: fix builds on RHEL <= 6
On 12/31/2015 12:09 AM, Michael Chapman wrote:
- dbus-devel is needed as build dependency if polkit support is
enabled.
- chkconfig(8) and service(8) are in /sbin/, not /bin/.
Both fixes are valid, and not just for RHEL <= 6, but they should be in
separate patches (both because they are separate issues, and because the
dbus-devel dependency is a long-standing bug that could/should be
backported to earlier maintenance releases while the chkconfig/service
location are fixes to a very recent addition, so they would cause a
merge conflict if backported).
ACK - I split it into two separate patches (both attributed to you) and
pushed them both.
Signed-off-by: Michael Chapman <mike(a)very.puzzling.org>
---
libvirt.spec.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 6193177..3afef66 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -647,8 +647,8 @@ BuildRequires: util-linux
BuildRequires: nfs-utils
%endif
-%if %{with_firewalld}
-# Communication with the firewall daemon uses DBus
+%if %{with_firewalld} || %{with_polkit}
+# Communication with the firewall and polkit daemons use DBus
BuildRequires: dbus-devel
%endif
@@ -1792,9 +1792,9 @@ if [ $1 -ge 1 ] ; then
/bin/systemctl start virtlogd.socket || :
%else
/sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
- /bin/chkconfig virtlogd on || :
+ /sbin/chkconfig virtlogd on || :
/sbin/service libvirtd status 1>/dev/null 2>&1 &&
- /bin/service virtlogd start || :
+ /sbin/service virtlogd start || :
%endif
fi