From 5de4fca2aa2cb04db71bf184f25bb7827a4faf9f Mon Sep 17 00:00:00 2001 From: wangchong1995924 <15229716099@163.com> Date: Mon, 7 Jul 2025 11:04:04 +0800 Subject: [PATCH] delete package xorg-x11-server-utils --- ...delete-package-xorg-x11-server-utils.patch | 43 +++++++++++++++++++ normal_aarch64.xml | 1 - normal_x86_64.xml | 1 - oemaker.spec | 8 +++- rpmlist.xml | 2 - 5 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 0002-delete-package-xorg-x11-server-utils.patch diff --git a/0002-delete-package-xorg-x11-server-utils.patch b/0002-delete-package-xorg-x11-server-utils.patch new file mode 100644 index 0000000..8450934 --- /dev/null +++ b/0002-delete-package-xorg-x11-server-utils.patch @@ -0,0 +1,43 @@ +From 569b7943b15ecec7a11f551cd81a454c13a66cb4 Mon Sep 17 00:00:00 2001 +From: wangchong1995924 <15229716099@163.com> +Date: Mon, 7 Jul 2025 14:33:56 +0800 +Subject: [PATCH] delete package xorg-x11-server-utils + + +diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl +index 876bbbd..d2bf781 100644 +--- a/isomaker/80-openeuler/runtime-cleanup.tmpl ++++ b/isomaker/80-openeuler/runtime-cleanup.tmpl +@@ -320,7 +320,6 @@ removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome* + removefrom xorg-x11-drv-synaptics /usr/bin/* + removefrom xorg-x11-drv-wacom /usr/bin/* + removefrom xorg-x11-fonts-misc --allbut /usr/share/X11/fonts/misc/{6x13,encodings,fonts,*cursor}* +-removefrom xorg-x11-server-utils --allbut /usr/bin/xrandr /usr/share/X11/rgb.txt /usr/bin/xrdb + removefrom yum /etc/* /usr/share/locale/* /usr/share/yum-cli/* + removefrom ${product.name}-logos /etc/* + removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/* +@@ -356,7 +355,7 @@ removefrom gstreamer1-plugins-base --allbut \ + removepkg geoclue2 + + ## And remove the packages that those extra libraries pulled in +-removepkg cdparanoia-libs opus libtheora libvisual flac-libs gsm avahi-glib avahi-libs \ ++removepkg cdparanoia-libs libtheora libvisual flac-libs gsm avahi-glib avahi-libs \ + ModemManager-glib + + ## metacity requires libvorbis and libvorbisfile, but enc/dec are no longer needed +diff --git a/isomaker/80-openeuler/runtime-install.tmpl b/isomaker/80-openeuler/runtime-install.tmpl +index d59f863..bef92c0 100644 +--- a/isomaker/80-openeuler/runtime-install.tmpl ++++ b/isomaker/80-openeuler/runtime-install.tmpl +@@ -89,7 +89,7 @@ installpkg rsyslog + + ## xorg/GUI packages + installpkg xorg-x11-drivers xorg-x11-server-Xorg +-installpkg xorg-x11-server-utils xorg-x11-xauth ++installpkg xorg-x11-xauth + installpkg dbus-x11 metacity gsettings-desktop-schemas + installpkg nm-connection-editor + installpkg librsvg2 +-- +2.27.0 + diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 6a80486..116a7cc 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -1375,7 +1375,6 @@ freerdp tigervnc - vinagre diff --git a/normal_x86_64.xml b/normal_x86_64.xml index afd66e8..6dc353d 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -1376,7 +1376,6 @@ freerdp tigervnc - vinagre diff --git a/oemaker.spec b/oemaker.spec index c1db354..42732ae 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: 11 +Release: 12 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -45,6 +45,7 @@ Requires: xorriso Patch0001: 0001-bugfix-IABY7K.patch Patch0002: 0001-fix-livecd-grub2-efi.cfg-not-found.patch Patch0003: 0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch +Patch0004: 0002-delete-package-xorg-x11-server-utils.patch %description a building tool for DVD ISO making and ISO cutting @@ -234,6 +235,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Mon Jul 07 2025 wangchong - 3.3.0-12 +- ID:NA +- SUG:NA +- DESC: delete package xorg-x11-server-utils + * Wed Jun 04 2025 Shi Hongyu - 3.3.0-11 - ID:NA - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index e04a981..bb9579c 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -351,7 +351,6 @@ findutils findutils-help fipscheck - fipscheck-help firewalld firewalld-doc firewalld-filesystem @@ -853,7 +852,6 @@ lz4-libs lz4-devel lzo - lzo-help lzo-minilzo lzop lzop-help -- Gitee