From addbd1d861151caa15eaafce772e2d0b0ff56d6c Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Fri, 21 Mar 2025 21:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

spec文件版本号修订

删除多余软件包

(cherry picked from commit 72a2f7f0fae8de39e746608dd1370c9e85bb3c9d)
---
 normal_aarch64.xml     |  1 -
 normal_loongarch64.xml |  1 -
 normal_riscv64.xml     |  1 -
 normal_x86_64.xml      |  1 -
 oemaker.spec           |  7 ++++-
 rpmlist.xml            |  4 ---
 rpmlist_riscv64.xml    | 69 ------------------------------------------
 7 files changed, 6 insertions(+), 78 deletions(-)

diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index d7dc902..4b1cdcf 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -1375,7 +1375,6 @@
     <packagelist>
       <packagereq type="optional">freerdp</packagereq>
       <packagereq type="optional">tigervnc</packagereq>
-      <packagereq type="optional">vinagre</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/normal_loongarch64.xml b/normal_loongarch64.xml
index 2f20ce6..d029907 100644
--- a/normal_loongarch64.xml
+++ b/normal_loongarch64.xml
@@ -1281,7 +1281,6 @@
     <packagelist>
       <packagereq type="optional">freerdp</packagereq>
       <packagereq type="optional">tigervnc</packagereq>
-      <packagereq type="optional">vinagre</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/normal_riscv64.xml b/normal_riscv64.xml
index dd3645c..6532c7d 100644
--- a/normal_riscv64.xml
+++ b/normal_riscv64.xml
@@ -1371,7 +1371,6 @@
     <packagelist>
       <packagereq type="optional">freerdp</packagereq>
       <packagereq type="optional">tigervnc</packagereq>
-      <packagereq type="optional">vinagre</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index 621d5b1..2856081 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -1376,7 +1376,6 @@
     <packagelist>
       <packagereq type="optional">freerdp</packagereq>
       <packagereq type="optional">tigervnc</packagereq>
-      <packagereq type="optional">vinagre</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/oemaker.spec b/oemaker.spec
index bbaf389..a245b88 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -15,7 +15,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.3.0
-Release:        7
+Release:        8
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -234,6 +234,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Tue Apr 22 2025 Liu Wang <1823363429@qq.com> - 3.3.0-8
+-ID:NA
+-SUG:NA
+-DESC: delete duplicate software packages
+
 * Fri Apr 18 2025 Liu Wang <1823363429@qq.com> - 3.3.0-7
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index 66950b5..c5de02c 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -1433,10 +1433,6 @@
         <packagereq>kubernetes-kubelet</packagereq>
         <packagereq>kubernetes-master</packagereq>
         <packagereq>kubernetes-node</packagereq>
-        <packagereq>kubernetes-cloudcore</packagereq>
-        <packagereq>kubernetes-edgecore</packagereq>
-        <packagereq>kubernetes-edgesite</packagereq>
-        <packagereq>kubernetes-keadm</packagereq>
         <packagereq type="default">k3s</packagereq>
         <packagereq type="default">k3s-selinux</packagereq>
         <packagereq type="default">k3s-plugins</packagereq>
diff --git a/rpmlist_riscv64.xml b/rpmlist_riscv64.xml
index 6ba4897..18a772e 100644
--- a/rpmlist_riscv64.xml
+++ b/rpmlist_riscv64.xml
@@ -57,24 +57,6 @@
         <packagereq>haoc-kernel-devel</packagereq>
         <packagereq>haoc-kernel-headers</packagereq>
     	<packagereq>nvwa</packagereq>
-	<packagereq>python3-keras-rl2</packagereq>
-        <packagereq>kernel-rt</packagereq>
-        <packagereq>kernel-rt-tools</packagereq>
-        <packagereq>kernel-rt-source</packagereq>
-        <packagereq>kernel-rt-devel</packagereq>
-        <packagereq>kernel-rt-headers</packagereq>
-        <packagereq>kernel-rt-tools-devel</packagereq>
-        <packagereq>raspberrypi-kernel</packagereq>
-        <packagereq>raspberrypi-kernel-devel</packagereq>
-        <packagereq>raspberrypi-kernel-rt</packagereq>
-        <packagereq>raspberrypi-kernel-rt-devel</packagereq>
-        <packagereq>haoc-kernel</packagereq>
-        <packagereq>haoc-kernel-source</packagereq>
-        <packagereq>haoc-kernel-tools</packagereq>
-        <packagereq>haoc-kernel-tools-devel</packagereq>
-        <packagereq>haoc-kernel-devel</packagereq>
-        <packagereq>haoc-kernel-headers</packagereq>
-    	<packagereq>nvwa</packagereq>
     </packagelist>
     <packagelist type="src_exclude">
         <packagereq>drbd</packagereq>
@@ -84,15 +66,6 @@
         <packagereq>kernel-rt</packagereq>
         <packagereq>raspberrypi-kernel</packagereq>
         <packagereq>raspberrypi-kernel-rt</packagereq>
-        <packagereq>apache-commons-vfs</packagereq>
-	<packagereq>apache-poi</packagereq>
-        <packagereq>mchange-commons</packagereq>
-        <packagereq>metrics</packagereq>
-	<packagereq>typesafe-config</packagereq>
-        <packagereq>haoc-kernel</packagereq>
-        <packagereq>kernel-rt</packagereq>
-        <packagereq>raspberrypi-kernel</packagereq>
-        <packagereq>raspberrypi-kernel-rt</packagereq>
     </packagelist>
     <packagelist type="everything_debug_exclude">
         <packagereq>drbd-debuginfo</packagereq>
@@ -115,11 +88,6 @@
         <packagereq>libwd</packagereq>
         <packagereq>shim-aa64</packagereq>
         <packagereq>oeAware-manager</packagereq>
-        <packagereq>librados2</packagereq>
-        <packagereq>kata-containers</packagereq>
-        <packagereq>DCF</packagereq>
-        <packagereq>opengauss</packagereq>
-        <packagereq>oeAware-manager</packagereq>
     </packagelist>
     <packagelist type="x86_64">
         <packagereq>edk2-ovmf</packagereq>
@@ -132,11 +100,6 @@
       <packagereq>edk2-ovmf-riscv64</packagereq>
       <packagereq>grub2-efi-riscv64</packagereq>
       <packagereq>grub2-efi-riscv64-modules</packagereq>
-        <packagereq>librados2</packagereq>
-        <packagereq>kata-containers</packagereq>
-        <packagereq>DCF</packagereq>
-        <packagereq>opengauss</packagereq>
-        <packagereq>oeAware-manager</packagereq>
     </packagelist>
     <packagelist type="common">
         <packagereq>abattis-cantarell-fonts</packagereq>
@@ -1479,38 +1442,6 @@
         <packagereq>k3s-selinux</packagereq>
         <packagereq>k3s-plugins</packagereq>
         <packagereq>k3s-containerd</packagereq>
-        <packagereq>kubeedge-cloudcore</packagereq>
-        <packagereq>kubeedge-edgecore</packagereq>
-        <packagereq>kubeedge-edgesite</packagereq>
-        <packagereq>kubeedge-keadm</packagereq>
-    </packagelist>
-    <packagelist type="edge_x86_64">
-        <packagereq>grub2-pc</packagereq>
-        <packagereq>grub2-pc-modules</packagereq>
-        <packagereq>grub2-efi-x64</packagereq>
-        <packagereq>shim</packagereq>
-    </packagelist>
-    <packagelist type="edge_riscv64">
-        <packagereq>grub2-efi-riscv64</packagereq>
-        <packagereq>grub2-efi-riscv64-cdboot</packagereq>
-        <packagereq>grub2-efi-riscv64-modules</packagereq>
-    </packagelist>
-    <packagelist type="edge_common">
-        <packagereq>kubernetes</packagereq>
-        <packagereq>kubernetes-client</packagereq>
-        <packagereq>kubernetes-help</packagereq>
-        <packagereq>kubernetes-kubeadm</packagereq>
-        <packagereq>kubernetes-kubelet</packagereq>
-        <packagereq>kubernetes-master</packagereq>
-        <packagereq>kubernetes-node</packagereq>
-        <packagereq>kubeedge-cloudcore</packagereq>
-        <packagereq>kubeedge-edgecore</packagereq>
-        <packagereq>kubeedge-edgesite</packagereq>
-        <packagereq>kubeedge-keadm</packagereq>
-        <packagereq>k3s</packagereq>
-        <packagereq>k3s-selinux</packagereq>
-        <packagereq>k3s-plugins</packagereq>
-        <packagereq>k3s-containerd</packagereq>
         <packagereq>grub2-common</packagereq>
         <packagereq>grub2-tools-minimal</packagereq>
         <packagereq>grub2-tools-extra</packagereq>
-- 
Gitee