From 759a0ecbb63b3a813e8848b5d1dea05ef65efc77 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 24 Jan 2025 11:08:55 +0800
Subject: [PATCH] drop retired packages

---
 normal_aarch64.xml      | 1 -
 normal_loongarch64.xml  | 1 -
 normal_riscv64.xml      | 1 -
 normal_x86_64.xml       | 1 -
 oemaker.spec            | 9 ++++++++-
 rpmlist.xml             | 2 --
 rpmlist_loongarch64.xml | 1 -
 rpmlist_riscv64.xml     | 2 --
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index e982b95..3e2e5f3 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -1408,7 +1408,6 @@
       <packagereq type="mandatory">spice-vdagent</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-utils</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="mandatory">xvattr</packagereq>
diff --git a/normal_loongarch64.xml b/normal_loongarch64.xml
index 2f20ce6..aa316c4 100644
--- a/normal_loongarch64.xml
+++ b/normal_loongarch64.xml
@@ -1316,7 +1316,6 @@
       <packagereq type="mandatory">spice-vdagent</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-utils</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="mandatory">xvattr</packagereq>
diff --git a/normal_riscv64.xml b/normal_riscv64.xml
index 175a94c..c49bf67 100644
--- a/normal_riscv64.xml
+++ b/normal_riscv64.xml
@@ -1400,7 +1400,6 @@
       <packagereq type="mandatory">spice-vdagent</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-utils</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="mandatory">xvattr</packagereq>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index 26baaf2..dc47070 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -1409,7 +1409,6 @@
       <packagereq type="mandatory">spice-vdagent</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-utils</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="mandatory">xvattr</packagereq>
diff --git a/oemaker.spec b/oemaker.spec
index 3a5a2c3..3f05132 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:        1
+Release:        2
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -223,6 +223,13 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Thu Jan 23 2025 Funda Wang <fundawang@yeah.net> - 3.3.0-2
+- ID:NA
+- SUG:NA
+- DESC: tpm2-tools-help was merged into tpm2-tools as of Oct 2024
+- DESC: attr-help was merged into attr as of Dec 2024
+- DESC: xorg-x11-utils was retired as of Dec 2024
+
 * Thu Jan 23 2025 Li Ping <1477412247@qq.com> - 3.3.0-1
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index 21c73ad..321d917 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -100,7 +100,6 @@
         <packagereq>at</packagereq>
         <packagereq>at-help</packagereq>
         <packagereq>attr</packagereq>
-        <packagereq>attr-help</packagereq>
         <packagereq>atune</packagereq>
         <packagereq>atune-client</packagereq>
         <packagereq>atune-db</packagereq>
@@ -1296,7 +1295,6 @@
         <packagereq>tpm2-abrmd</packagereq>
         <packagereq>tpm2-abrmd-help</packagereq>
         <packagereq>tpm2-tools</packagereq>
-        <packagereq>tpm2-tools-help</packagereq>
         <packagereq>tpm2-tss</packagereq>
         <packagereq>tpm2-tss-help</packagereq>
         <packagereq>traceroute</packagereq>
diff --git a/rpmlist_loongarch64.xml b/rpmlist_loongarch64.xml
index 0ea4992..d0b4836 100644
--- a/rpmlist_loongarch64.xml
+++ b/rpmlist_loongarch64.xml
@@ -191,7 +191,6 @@
         <packagereq>at</packagereq>
         <packagereq>at-help</packagereq>
         <packagereq>attr</packagereq>
-        <packagereq>attr-help</packagereq>
         <packagereq>audiofile</packagereq>
         <packagereq>audit</packagereq>
         <packagereq>audit-help</packagereq>
diff --git a/rpmlist_riscv64.xml b/rpmlist_riscv64.xml
index 639459d..dc71efb 100644
--- a/rpmlist_riscv64.xml
+++ b/rpmlist_riscv64.xml
@@ -119,7 +119,6 @@
         <packagereq>at</packagereq>
         <packagereq>at-help</packagereq>
         <packagereq>attr</packagereq>
-        <packagereq>attr-help</packagereq>
         <packagereq>atune</packagereq>
         <packagereq>atune-client</packagereq>
         <packagereq>atune-db</packagereq>
@@ -1314,7 +1313,6 @@
         <packagereq>tpm2-abrmd</packagereq>
         <packagereq>tpm2-abrmd-help</packagereq>
         <packagereq>tpm2-tools</packagereq>
-        <packagereq>tpm2-tools-help</packagereq>
         <packagereq>tpm2-tss</packagereq>
         <packagereq>tpm2-tss-help</packagereq>
         <packagereq>traceroute</packagereq>
-- 
Gitee