From 1351d12b8b81e8d361bab4dbacb6a0cbad958bcc Mon Sep 17 00:00:00 2001
From: SPYFAMILY <xiexiunian@h-partners.com>
Date: Sat, 13 Dec 2025 19:22:00 +0800
Subject: [PATCH] =?UTF-8?q?remove=20firefox=20and=20gjs=20from=20baseos=20?=
 =?UTF-8?q?1.=20=E4=BF=9D=E6=8C=81normal=5Fx86=5F64.xml=E3=80=81normal=5Fa?=
 =?UTF-8?q?arch64.xml=E7=9A=84=E4=B8=80=E8=87=B4=E6=80=A7=EF=BC=8Cfirefox?=
 =?UTF-8?q?=E7=A7=BB=E5=87=BAbaseos=E5=AF=B9openEuler=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E7=B3=BB=E7=BB=9F=E6=97=A0=E5=BD=B1=E5=93=8D=202.=20g?=
 =?UTF-8?q?lade=E8=A7=A3=E4=BE=9D=E8=B5=96gjs=EF=BC=8Cgjs=E5=8F=AF?=
 =?UTF-8?q?=E7=A7=BB=E5=87=BAbaseos=20https://gitee.com/src-openeuler/glad?=
 =?UTF-8?q?e/pulls/27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 normal_aarch64.xml | 2 +-
 normal_x86_64.xml  | 3 +--
 oemaker.spec       | 7 ++++++-
 rpmlist.xml        | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index 9ecae22..5af70e9 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -743,7 +743,7 @@
     <packagelist>
     </packagelist>
   </group>
-    <group>
+  <group>
     <id>java-platform</id>
     <name>Java Platform</name>
     <name xml:lang="zh_CN">Java 平台</name>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index 4db89a7..829b81b 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -741,10 +741,9 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">firefox</packagereq>
     </packagelist>
   </group>
-    <group>
+  <group>
     <id>java-platform</id>
     <name>Java Platform</name>
     <name xml:lang="zh_CN">Java 平台</name>
diff --git a/oemaker.spec b/oemaker.spec
index 12211a0..710874e 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:        17
+Release:        18
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -251,6 +251,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Sat Dec 13 2025 xiexiunian <xiexiunian@h-partners.com> - 3.3.0-18
+- ID:NA 
+- SUG:NA
+- DESC: remove firefox and gjs from baseos
+
 * Wed Nov 12 2025 yueyuankun <yueyuankun@kylinos.cn> - 3.3.0-17
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index e844f47..5030188 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -372,7 +372,6 @@
         <packagereq>git</packagereq>
         <packagereq>git-clang-format</packagereq>
         <packagereq>git-help</packagereq>
-        <packagereq>gjs</packagereq>
         <packagereq>glib2</packagereq>
         <packagereq>glib2-help</packagereq>
         <packagereq>glibc</packagereq>
-- 
Gitee