From 7a0298d7ff5e6006169a305edc43393a37427f1a Mon Sep 17 00:00:00 2001
From: virtbuilder_pel7x64builder0 <virtbuilder@powerel.org>
Date: Thu, 13 Jun 2019 15:22:10 +0200
Subject: [PATCH] libvirt update 5.4.0 and add iscsi_direct support

Signed-off-by: virtbuilder_pel7x64builder0 <virtbuilder@powerel.org>
---
 SPECS/libvirt.spec | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/SPECS/libvirt.spec b/SPECS/libvirt.spec
index 6826cf2..c5447ae 100644
--- a/SPECS/libvirt.spec
+++ b/SPECS/libvirt.spec
@@ -49,7 +49,7 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 5.3.0
+Version: 5.4.0
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
@@ -62,10 +62,6 @@ URL: https://libvirt.org/
 Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
 Source1: symlinks
 
-#%ifarch x86_64
-#Patch1: libvirt-network-bridge-function.patch
-#%endif
-#Patch2: libvirt-network-switch-function.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -180,6 +176,7 @@ BuildRequires: /usr/bin/qemu-img
 BuildRequires: lvm2
 # For ISCSI driver
 BuildRequires: iscsi-initiator-utils
+BuildRequires: libiscsi-devel
 # For disk driver
 BuildRequires: parted-devel
 # For Multipath support
@@ -1058,9 +1055,9 @@ rm -rf .git
 %endif
 
 %if %{with_firewalld}
-    %define arg_firewalld --with-firewalld
+    %define arg_firewalld --with-firewalld --with-firewalld-zone
 %else
-    %define arg_firewalld --without-firewalld
+    %define arg_firewalld --without-firewalld --without-firewalld-zone
 %endif
 
 %if %{with_wireshark}
@@ -1136,6 +1133,7 @@ rm -f po/stamp-po
            --with-storage-fs \
            --with-storage-lvm \
            --with-storage-iscsi \
+           --with-storage-iscsi-direct \
            --with-storage-scsi \
            --with-storage-disk \
            --with-storage-mpath \
@@ -1255,7 +1253,7 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
 %endif
 
 # Copied into libvirt-docs subpackage eventually
-mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
 
 %ifarch %{power64} s390x x86_64 ia64 alpha sparc64
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
@@ -1713,6 +1711,7 @@ exit 0
 
 %files daemon-driver-storage-iscsi
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
+%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
 
 %files daemon-driver-storage-mpath
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so