From 750c58d541994cfbf6e4e2498c704c0256bb9630 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Mon, 3 Oct 2022 12:43:07 +0200 Subject: [PATCH] libvirt-8.8.0-1.el9 - Rebased to libvirt-8.8.0 (rhbz#2124466) - The rebase also fixes the following bugs: rhbz#2122534, rhbz#2121262, rhbz#2130089, rhbz#2121276, rhbz#2121627 rhbz#2125111, rhbz#2129239, rhbz#1964855, rhbz#2114866 Resolves: rhbz#1964855, rhbz#2114866, rhbz#2121262, rhbz#2121276, rhbz#2121627 Resolves: rhbz#2122534, rhbz#2124466, rhbz#2125111, rhbz#2129239, rhbz#2130089 --- libvirt.spec | 50 ++++++++++---------------------------------------- sources | 2 +- symlinks | 1 - 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index cdcdeeb..91849b1 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -61,11 +61,6 @@ # Then the secondary host drivers, which run inside libvirtd %define with_storage_rbd 0%{!?_without_storage_rbd:1} -%if 0%{?fedora} - %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:1} -%else - %define with_storage_sheepdog 0 -%endif %define with_storage_gluster 0%{!?_without_storage_gluster:1} %if 0%{?rhel} @@ -234,7 +229,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 8.7.0 +Version: 8.8.0 Release: 1%{?dist}%{?extra_release} License: LGPLv2+ URL: https://libvirt.org/ @@ -340,9 +335,6 @@ BuildRequires: librbd-devel BuildRequires: glusterfs-api-devel >= 3.4.1 BuildRequires: glusterfs-devel >= 3.4.1 %endif -%if %{with_storage_sheepdog} -BuildRequires: sheepdog -%endif %if %{with_numactl} # For QEMU/LXC numa info BuildRequires: numactl-devel @@ -387,7 +379,7 @@ BuildRequires: wireshark-devel %endif %if %{with_libssh} -BuildRequires: libssh-devel >= 0.7.0 +BuildRequires: libssh-devel >= 0.8.1 %endif BuildRequires: rpcgen @@ -583,8 +575,9 @@ Requires: util-linux Requires: /usr/bin/qemu-img %endif %if !%{with_storage_rbd} -Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release} +Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 %endif +Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing @@ -688,19 +681,6 @@ volumes using the ceph protocol. %endif -%if %{with_storage_sheepdog} -%package daemon-driver-storage-sheepdog -Summary: Storage driver plugin for sheepdog -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} -Requires: sheepdog - -%description daemon-driver-storage-sheepdog -The storage driver backend adding implementation of the storage APIs for -sheepdog volumes using. -%endif - - %if %{with_storage_zfs} %package daemon-driver-storage-zfs Summary: Storage driver plugin for ZFS @@ -733,9 +713,6 @@ Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} %if %{with_storage_rbd} Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} %endif -%if %{with_storage_sheepdog} -Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release} -%endif %if %{with_storage_zfs} Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release} %endif @@ -1092,12 +1069,6 @@ exit 1 %define arg_storage_rbd -Dstorage_rbd=disabled %endif -%if %{with_storage_sheepdog} - %define arg_storage_sheepdog -Dstorage_sheepdog=enabled -%else - %define arg_storage_sheepdog -Dstorage_sheepdog=disabled -%endif - %if %{with_storage_gluster} %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled %else @@ -1217,7 +1188,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dstorage_disk=enabled \ -Dstorage_mpath=enabled \ %{?arg_storage_rbd} \ - %{?arg_storage_sheepdog} \ %{?arg_storage_gluster} \ %{?arg_storage_zfs} \ -Dstorage_vstorage=disabled \ @@ -1329,7 +1299,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dstorage_mpath=disabled \ -Dstorage_rbd=disabled \ -Dstorage_scsi=disabled \ - -Dstorage_sheepdog=disabled \ -Dstorage_vstorage=disabled \ -Dstorage_zfs=disabled \ -Dsysctl_config=disabled \ @@ -2045,11 +2014,6 @@ exit 0 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so %endif -%if %{with_storage_sheepdog} -%files daemon-driver-storage-sheepdog -%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so -%endif - %if %{with_storage_zfs} %files daemon-driver-storage-zfs %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so @@ -2426,6 +2390,12 @@ exit 0 %endif %changelog +* Mon Oct 3 2022 Jiri Denemark - 8.8.0-1 +- Rebased to libvirt-8.8.0 (rhbz#2124466) +- The rebase also fixes the following bugs: + rhbz#2122534, rhbz#2121262, rhbz#2130089, rhbz#2121276, rhbz#2121627 + rhbz#2125111, rhbz#2129239, rhbz#1964855, rhbz#2114866 + * Tue Sep 6 2022 Jiri Denemark - 8.7.0-1 - Rebased to libvirt-8.7.0 (rhbz#2124466) - The rebase also fixes the following bugs: diff --git a/sources b/sources index ed5e703..1a8f446 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-8.7.0.tar.xz) = 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a +SHA512 (libvirt-8.8.0.tar.xz) = 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190 diff --git a/symlinks b/symlinks index fe61c47..6658ac3 100644 --- a/symlinks +++ b/symlinks @@ -109,7 +109,6 @@ tests/qemuxml2argvdata/pseries-features-nested-hv.xml pseries-features.xml tests/qemuxml2argvdata/pseries-features-sbbc.xml pseries-features.xml tests/qemuxml2argvdata/pseries-serial+console-native.args pseries-serial-native.args tests/qemuxml2argvdata/pseries-serial-compat.args pseries-serial-native.args -tests/qemuxml2argvdata/q35-virtio-pci.xml q35-pcie.xml tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml usb-controller-default-q35.xml tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml usb-controller-explicit-q35.xml tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml usb-controller-qemu-xhci.xml