diff --git a/0002-runtime-install-don-t-install-notification-daemon.patch b/0002-runtime-install-don-t-install-notification-daemon.patch new file mode 100644 index 0000000000000000000000000000000000000000..7ab6366930117ebbf32079680661337c2742b39e --- /dev/null +++ b/0002-runtime-install-don-t-install-notification-daemon.patch @@ -0,0 +1,47 @@ +From f8d42ada1af5cf44435f794e55b6492d4ece8116 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 4 Sep 2020 15:41:29 -0700 +Subject: [PATCH] runtime-install: don't install notification-daemon + +libnotify dropped the requirement just a couple of months after +this line was added, but we never took it back out again. + +Reference:https://github.com/weldr/lorax/commit/a87f438af10e308eb20f2eb2712abe3f820c674a +The patch was adapted to remove the useless deletion of notification-daemon in runtime-cleanup.tmpl + +Signed-off-by: Adam Williamson +Signed-off-by: Qiumiao Zhang +--- + isomaker/80-openeuler/runtime-cleanup.tmpl | 2 -- + isomaker/80-openeuler/runtime-install.tmpl | 3 --- + 2 files changed, 5 deletions(-) + +diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl +index d276780..c3f6966 100644 +--- a/isomaker/80-openeuler/runtime-cleanup.tmpl ++++ b/isomaker/80-openeuler/runtime-cleanup.tmpl +@@ -46,8 +46,6 @@ removepkg dmraid-events sgpio + ## keep library files + removefrom device-mapper-event --allbut \ + /usr/lib64/libdevmapper-event.so.* +-## no notifications in anaconda +-removepkg notification-daemon + ## logrotate isn't useful in anaconda + removepkg logrotate + remove /etc/logrotate.d +diff --git a/isomaker/80-openeuler/runtime-install.tmpl b/isomaker/80-openeuler/runtime-install.tmpl +index 1856aff..b681fe5 100644 +--- a/isomaker/80-openeuler/runtime-install.tmpl ++++ b/isomaker/80-openeuler/runtime-install.tmpl +@@ -134,8 +134,5 @@ installpkg wget rsync bind-utils ftp mtr vconfig + installpkg icfg spice-vdagent + installpkg gdisk sg3_utils + +-## satisfy libnotify's desktop-notification-daemon with the least crazy option +-installpkg notification-daemon +- + ## actually install all the requested packages + run_pkg_transaction +-- +2.28.0.windows.1 + diff --git a/oemaker.spec b/oemaker.spec index f01ea70c71564ab711148388f9ccf401936dbcac..5de010f5601d7a5b85c6315bc108f77d27b2b6fa 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.0 -Release: 5 +Release: 6 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -23,6 +23,7 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 Patch0001: 0001-rename-source-iso.patch +Patch0002: 0002-runtime-install-don-t-install-notification-daemon.patch %description a building tool for DVD ISO making and ISO cutting @@ -120,6 +121,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Fri Apr 23 2021 zhangqiumiao - 2.0.0-6 +- ID:NA +- SUG:NA +- DESC: runtime-install: don't install notification-daemon + * Wed Apr 7 2021 miao_kaibo - 2.0.0-5 - ID:NA - SUG:NA