diff --git a/libvirt.spec b/libvirt.spec
index d042c8a..b6845fa 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -85,6 +85,10 @@
%endif
%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
+# libiscsi has been dropped in RHEL-9
+%if 0%{?rhel} > 8
+ %define with_storage_iscsi_direct 0
+%endif
# Other optional features
%define with_numactl 0%{!?_without_numactl:1}
@@ -196,8 +200,8 @@
Summary: Library providing a simple virtualization API
Name: libvirt
-Version: 7.4.0
-Release: 2%{?dist}
+Version: 7.5.0
+Release: 1%{?dist}
License: LGPLv2+
URL: https://libvirt.org/
@@ -243,7 +247,6 @@ BuildRequires: ninja-build
BuildRequires: git
BuildRequires: perl-interpreter
BuildRequires: python3
-BuildRequires: systemd-units
%if %{with_libxl}
BuildRequires: xen-devel
%endif
@@ -408,10 +411,7 @@ Requires: polkit >= 0.112
Requires: dmidecode
%endif
# For service management
-Requires(post): systemd-units
-Requires(post): systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): /usr/bin/systemctl
%if %{with_numad}
Requires: numad
%endif
@@ -1098,11 +1098,14 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-Dsasl=enabled \
-Dpolkit=enabled \
-Ddriver_libvirtd=enabled \
+ -Ddriver_remote=enabled \
+ -Ddriver_test=enabled \
%{?arg_esx} \
%{?arg_hyperv} \
%{?arg_vmware} \
-Ddriver_vz=disabled \
-Ddriver_bhyve=disabled \
+ -Ddriver_ch=disabled \
-Dremote_default_mode=legacy \
-Ddriver_interface=enabled \
-Ddriver_network=enabled \
@@ -1126,6 +1129,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-Dselinux=enabled \
%{?arg_selinux_mount} \
-Dapparmor=disabled \
+ -Dapparmor_profiles=disabled \
-Dsecdriver_apparmor=disabled \
-Dudev=enabled \
-Dyajl=enabled \
@@ -1178,7 +1182,7 @@ rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la
%endif
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
-# We don't want to install /etc/libvirt/qemu/networks in the main %files list
+# We don't want to install /etc/libvirt/qemu/networks in the main %%files list
# because if the admin wants to delete the default network completely, we don't
# want to end up re-incarnating it on every RPM upgrade.
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
@@ -1187,7 +1191,7 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
# libvirt saves this file with mode 0600
chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
-# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post
+# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %%post
# to avoid verification errors on changed files in /etc
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/
cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \
@@ -1253,31 +1257,35 @@ getent group libvirt >/dev/null || groupadd -r libvirt
exit 0
%post daemon
+%global post_units \\\
+ virtlockd.socket virtlockd-admin.socket \\\
+ virtlogd.socket virtlogd-admin.socket \\\
+ libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\
+ libvirtd-tcp.socket libvirtd-tls.socket \\\
+ libvirtd.service \\\
+ libvirt-guests.service
-%systemd_post virtlockd.socket virtlockd-admin.socket
-%systemd_post virtlogd.socket virtlogd-admin.socket
-%systemd_post libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
-%systemd_post libvirtd-tcp.socket libvirtd-tls.socket
-%systemd_post libvirtd.service
-%systemd_post libvirt-guests.service
+%systemd_post %post_units
# request daemon restart in posttrans
mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
%preun daemon
-%systemd_preun libvirtd.service
-%systemd_preun libvirtd-tcp.socket libvirtd-tls.socket
-%systemd_preun libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
-%systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service
-%systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service
-%systemd_preun libvirt-guests.service
+%global preun_units \\\
+ libvirtd.service \\\
+ libvirtd-tcp.socket libvirtd-tls.socket \\\
+ libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\
+ virtlogd.socket virtlogd-admin.socket virtlogd.service \\\
+ virtlockd.socket virtlockd-admin.socket virtlockd.service \\\
+ libvirt-guests.service
+
+%systemd_preun %preun_units
%postun daemon
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || :
- /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || :
+ /bin/systemctl reload-or-try-restart virtlockd.service virtlogd.service >/dev/null 2>&1 || :
fi
%systemd_postun libvirt-guests.service
@@ -1304,11 +1312,12 @@ if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
# systemd socket activation, because switching things
# might confuse mgmt tool like puppet/ansible that
# expect the old style libvirtd
- /bin/systemctl mask libvirtd.socket >/dev/null 2>&1 || :
- /bin/systemctl mask libvirtd-ro.socket >/dev/null 2>&1 || :
- /bin/systemctl mask libvirtd-admin.socket >/dev/null 2>&1 || :
- /bin/systemctl mask libvirtd-tls.socket >/dev/null 2>&1 || :
- /bin/systemctl mask libvirtd-tcp.socket >/dev/null 2>&1 || :
+ /bin/systemctl mask \
+ libvirtd.socket \
+ libvirtd-ro.socket \
+ libvirtd-admin.socket \
+ libvirtd-tls.socket \
+ libvirtd-tcp.socket >/dev/null 2>&1 || :
else
# Old libvirtd owns the sockets and will delete them on
# shutdown. Can't use a try-restart as libvirtd will simply
@@ -1320,9 +1329,10 @@ if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
then
/bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
- /bin/systemctl try-restart libvirtd.socket >/dev/null 2>&1 || :
- /bin/systemctl try-restart libvirtd-ro.socket >/dev/null 2>&1 || :
- /bin/systemctl try-restart libvirtd-admin.socket >/dev/null 2>&1 || :
+ /bin/systemctl try-restart \
+ libvirtd.socket \
+ libvirtd-ro.socket \
+ libvirtd-admin.socket >/dev/null 2>&1 || :
/bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
fi
@@ -1892,6 +1902,9 @@ exit 0
%changelog
+* Thu Jul 01 2021 Cole Robinson <crobinso@redhat.com> - 7.5.0-1
+- Update to version 7.5.0
+
* Mon Jun 07 2021 Cole Robinson <crobinso@redhat.com> - 7.4.0-2
- Rebuild for xen 4.14
diff --git a/sources b/sources
index fcb2f04..99e1ba6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvirt-7.4.0.tar.xz) = efe3fb2813613c3c5e94ed49d0cae4ad92cca6a727a8b55808d8c3bdfacb355642796dfab49362ee59654f9471f9134b96374ced50cc9b3227f4f1c6201bf7f1
+SHA512 (libvirt-7.5.0.tar.xz) = cf89800c8970b8b1373ee32cc49ea88b87e76b50fd134df5da354be83e0ef490e514f16425c1c16eb3989fbadd3ba7d9976972fbbae6cb40db3d2ae94863219d