diff --git a/libvirt.spec b/libvirt.spec
index 4afef55..9b99b6d 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -18,7 +18,6 @@
%{!?enable_autotools:%global enable_autotools 0}
# The hypervisor drivers that run in libvirtd
-%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1}
%define with_lxc 0%{!?_without_lxc:1}
%define with_uml 0%{!?_without_uml:1}
@@ -96,7 +95,6 @@
# Xen is available only on i386 x86_64 ia64
%ifnarch %{ix86} x86_64 ia64
- %define with_xen 0
%define with_libxl 0
%endif
@@ -161,11 +159,6 @@
%define with_firewalld 1
%endif
-# RHEL-6 stopped including Xen on all archs.
-%if 0%{?rhel}
- %define with_xen 0
-%endif
-
# fuse is used to provide virtualized /proc for LXC
%if %{with_lxc} && 0%{?rhel} != 6
%define with_fuse 0%{!?_without_fuse:1}
@@ -253,7 +246,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
-Version: 4.2.0
+Version: 4.3.0
Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
@@ -280,9 +273,6 @@ Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
%if %{with_uml}
Requires: libvirt-daemon-driver-uml = %{version}-%{release}
%endif
-%if %{with_xen}
-Requires: libvirt-daemon-driver-xen = %{version}-%{release}
-%endif
%if %{with_vbox}
Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
%endif
@@ -316,7 +306,7 @@ BuildRequires: %{python}
%if %{with_systemd}
BuildRequires: systemd-units
%endif
-%if %{with_xen} || %{with_libxl}
+%if %{with_libxl}
BuildRequires: xen-devel
%endif
BuildRequires: libxml2-devel
@@ -376,11 +366,6 @@ BuildRequires: util-linux
BuildRequires: libacl-devel
# From QEMU RPMs
BuildRequires: /usr/bin/qemu-img
-%else
- %if %{with_xen}
-# From Xen RPMs
-BuildRequires: /usr/sbin/qcow-create
- %endif
%endif
# For LVM drivers
BuildRequires: lvm2
@@ -634,11 +619,6 @@ Requires: util-linux
%if %{with_qemu}
# From QEMU RPMs
Requires: /usr/bin/qemu-img
-%else
- %if %{with_xen}
-# From Xen RPMs
-Requires: /usr/sbin/qcow-create
- %endif
%endif
%description daemon-driver-storage-core
@@ -843,19 +823,6 @@ User Mode Linux
%endif
-%if %{with_xen}
-%package daemon-driver-xen
-Summary: Xen driver plugin for the libvirtd daemon
-Group: Development/Libraries
-Requires: libvirt-daemon = %{version}-%{release}
-
-%description daemon-driver-xen
-The Xen driver plugin for the libvirtd daemon, providing
-an implementation of the hypervisor driver APIs using
-Xen
-%endif
-
-
%if %{with_vbox}
%package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon
@@ -874,6 +841,7 @@ VirtualBox
Summary: Libxl driver plugin for the libvirtd daemon
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
+Obsoletes: libvirt-daemon-driver-xen < 4.3.0
%description daemon-driver-libxl
The Libxl driver plugin for the libvirtd daemon, providing
@@ -966,15 +934,12 @@ capabilities of UML
%endif
-%if %{with_xen} || %{with_libxl}
+%if %{with_libxl}
%package daemon-xen
Summary: Server side daemon & driver required to run XEN guests
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
- %if %{with_xen}
-Requires: libvirt-daemon-driver-xen = %{version}-%{release}
- %endif
%if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
%endif
@@ -1169,12 +1134,6 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
exit 1
%endif
-%if %{with_xen}
- %define arg_xen --with-xen
-%else
- %define arg_xen --without-xen
-%endif
-
%if %{with_qemu}
%define arg_qemu --with-qemu
%else
@@ -1342,8 +1301,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
%endif
rm -f po/stamp-po
-%configure %{?arg_xen} \
- %{?arg_qemu} \
+%configure %{?arg_qemu} \
%{?arg_openvz} \
%{?arg_lxc} \
%{?arg_vbox} \
@@ -2002,12 +1960,6 @@ exit 0
%{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so
%endif
-%if %{with_xen}
-%files daemon-driver-xen
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so
-%endif
-
%if %{with_libxl}
%files daemon-driver-libxl
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
@@ -2042,7 +1994,7 @@ exit 0
%files daemon-uml
%endif
-%if %{with_xen} || %{with_libxl}
+%if %{with_libxl}
%files daemon-xen
%endif
@@ -2197,6 +2149,9 @@ exit 0
%changelog
+* Thu May 3 2018 Daniel P. Berrangé <berrange@redhat.com> - 4.3.0-1
+- Update to 4.2.0 release
+
* Tue Apr 3 2018 Daniel P. Berrangé <berrange@redhat.com> - 4.2.0-1
- Update to 4.2.0 release
diff --git a/sources b/sources
index b5f692e..ae20fa7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvirt-4.2.0.tar.xz) = ced3a7408e95f1663deec03b095780d0f805126506a064a11063d1f313f923eb0ff0ea95f99826514d8cb4e51c850f6f02904e06e5ef8106c38898a0cfe7f9ed
+SHA512 (libvirt-4.3.0.tar.xz) = cc61497121931019a8cc3fa8234d7cf95b0f0e1d77ab6fcd089db92759617b099eb83c57aa91768ae6ccf92c345cf72e1d9b202acb5132a159476fb86f1a6999