On Tue, May 03, 2016 at 11:35:35AM +0200, Andrea Bolognani wrote:
The changes pushed yesterday have introduced an issue where
systemd was turned into systemd+redhat on RHEL systems,
which in turn caused RPM building to fail[1].
Patch 1/4 is the actual fix; patch 2/4 changes the code so
that breaking it again is hopefully a bit harder.
Patches 3/4 and 4/4 clean up a couple of barely related issues
in the spec file that I've ran into while investigating this.
[1]
https://ci.centos.org/view/libvirt-project/job/libvirt-daemon-rpm/systems...
Andrea Bolognani (4):
configure: Change RHEL default from systemd+redhat to systemd
configure: Remove nested conditionals in LIBVIRT_CHECK_INIT_SCRIPT
spec: Type --with-init-script correctly
spec: Rename %{init_scripts} -> %{with_init_script}
libvirt.spec.in | 6 +++---
m4/virt-init-script.m4 | 21 ++++++---------------
2 files changed, 9 insertions(+), 18 deletions(-)
ACK series.
(Please keep in mind that I was the one who ACKed the series that broke it
when pushing it)
Jan