From b18bb8c455d1665412cd0324efafc30986759fb3 Mon Sep 17 00:00:00 2001
From: MaYunlong <mayunlong6@huawei.com>
Date: Wed, 27 Mar 2024 10:05:54 +0800
Subject: [PATCH] delete libvirt package

---
 normal_aarch64.xml | 4 +---
 normal_x86_64.xml  | 4 +---
 oemaker.spec       | 7 ++++++-
 rpmlist.xml        | 4 +---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index 1fa1cda..942d222 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -1313,8 +1313,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">libvirt</packagereq>
-      <packagereq type="mandatory">libvirt-admin</packagereq>
-      <packagereq type="mandatory">libvirt-bash-completion</packagereq>
       <packagereq type="mandatory">libvirt-client</packagereq>
       <packagereq type="mandatory">libvirt-daemon</packagereq>
       <packagereq type="mandatory">libvirt-daemon-config-network</packagereq>
@@ -1336,11 +1334,11 @@
       <packagereq type="mandatory">libvirt-daemon-driver-storage-rbd</packagereq>
       <packagereq type="mandatory">libvirt-daemon-driver-storage-scsi</packagereq>
       <packagereq type="mandatory">libvirt-daemon-kvm</packagereq>
+      <packagereq type="mandatory">libvirt-daemon-plugin-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-daemon-qemu</packagereq>
       <packagereq type="mandatory">libvirt-devel</packagereq>
       <packagereq type="mandatory">libvirt-docs</packagereq>
       <packagereq type="mandatory">libvirt-libs</packagereq>
-      <packagereq type="mandatory">libvirt-lock-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-nss</packagereq>
       <packagereq type="mandatory">python3-libvirt</packagereq>
       <packagereq type="mandatory">edk2-aarch64</packagereq>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index 6444dc6..26baaf2 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -1317,8 +1317,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">libvirt</packagereq>
-      <packagereq type="mandatory">libvirt-admin</packagereq>
-      <packagereq type="mandatory">libvirt-bash-completion</packagereq>
       <packagereq type="mandatory">libvirt-client</packagereq>
       <packagereq type="mandatory">libvirt-daemon</packagereq>
       <packagereq type="mandatory">libvirt-daemon-config-network</packagereq>
@@ -1340,11 +1338,11 @@
       <packagereq type="mandatory">libvirt-daemon-driver-storage-rbd</packagereq>
       <packagereq type="mandatory">libvirt-daemon-driver-storage-scsi</packagereq>
       <packagereq type="mandatory">libvirt-daemon-kvm</packagereq>
+      <packagereq type="mandatory">libvirt-daemon-plugin-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-daemon-qemu</packagereq>
       <packagereq type="mandatory">libvirt-devel</packagereq>
       <packagereq type="mandatory">libvirt-docs</packagereq>
       <packagereq type="mandatory">libvirt-libs</packagereq>
-      <packagereq type="mandatory">libvirt-lock-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-nss</packagereq>
       <packagereq type="mandatory">python3-libvirt</packagereq>
       <packagereq type="mandatory">qemu-help</packagereq>
diff --git a/oemaker.spec b/oemaker.spec
index c1b6ce0..f1c0189 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.1.0
-Release:        6
+Release:        7
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -172,6 +172,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Thu Mar 28 2024 mayunlong <mayunlong6@huawei.com> - 3.1.0-7
+- ID:NA
+- SUG:NA
+- DESC: delete libvirt package
+
 * Wed Mar 20 2024 sunhai <sunhai10@huawei.com> - 3.1.0-6
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index c67d4af..5e553ce 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -717,8 +717,6 @@
         <packagereq>libverto-glib</packagereq>
         <packagereq>libverto-libevent</packagereq>
         <packagereq>libvirt</packagereq>
-        <packagereq>libvirt-admin</packagereq>
-        <packagereq>libvirt-bash-completion</packagereq>
         <packagereq>libvirt-client</packagereq>
         <packagereq>libvirt-daemon</packagereq>
         <packagereq>libvirt-daemon-config-network</packagereq>
@@ -739,7 +737,7 @@
         <packagereq>libvirt-daemon-driver-storage-mpath</packagereq>
         <packagereq>libvirt-daemon-driver-storage-rbd</packagereq>
         <packagereq>libvirt-daemon-driver-storage-scsi</packagereq>
-        <packagereq>libvirt-daemon-kvm</packagereq>
+	<packagereq>libvirt-daemon-kvm</packagereq>
         <packagereq>libvirt-daemon-qemu</packagereq>
         <packagereq>libvirt-devel</packagereq>
         <packagereq>libvirt-docs</packagereq>
-- 
Gitee