From 38f31603b39b849d414885f53065afecef4d087f Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Sat, 22 Jun 2024 18:34:15 +0800 Subject: [PATCH] adjust some requires and config for derived os --- anaconda.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/anaconda.spec b/anaconda.spec index c1ec70e..84b86f6 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 35 +Release: 36 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -96,7 +96,7 @@ BuildRequires: gsettings-desktop-schemas metacity Requires: anaconda-core = %{version}-%{release} Requires: anaconda-tui = %{version}-%{release} Requires: libblockdev-plugins-all >= %{libblockdevver} realmd isomd5sum >= %{isomd5sumver} -Requires: kexec-tools createrepo_c tmux gdb rsync python3-meh-gui >= %{mehver} +Requires: kexec-tools createrepo_c tmux rsync python3-meh-gui >= %{mehver} Requires: adwaita-icon-theme python3-kickstart Requires: tigervnc-server-minimal libxklavier >= %{libxklavierver} libgnomekbd Requires: nm-connection-editor keybinder3 system-logos @@ -126,11 +126,10 @@ Requires: python3-pyparted >= %{pypartedver} python3-requests python3-requests-f Requires: python3-requests-ftp python3-kickstart >= %{pykickstartver} Requires: python3-langtable >= %{langtablever} util-linux >= %{utillinuxver} python3-gobject-base Requires: python3-dbus python3-pwquality python3-systemd python3-dasbus >= %{dasbusver} -Requires: python3-packaging Requires: cracklib-dicts python3-pytz teamd NetworkManager >= %{nmver} NetworkManager-libnm >= %{nmver} -Requires: NetworkManager-team kbd chrony systemd python3-pid +Requires: kbd chrony systemd python3-pid Requires: python3-ordered-set >= 2.0.0 glibc-langpack-en dbus-daemon -Requires: systemd-resolved +Recommends: python3-packaging NetworkManager-team systemd-resolved # Required by the systemd service anaconda-fips. Requires: crypto-policies Requires: /usr/bin/update-crypto-policies @@ -206,8 +205,8 @@ cp %{SOURCE5} %{SOURCE5}_tmp # install openEuler conf for anaconda %ifarch x86_64 sed -i "/^additional_arguments =*/ s/$/ crashkernel=512M/" %{SOURCE1} -sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1/" %{SOURCE2} -sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1/" %{SOURCE3} +sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1 quiet/" %{SOURCE2} +sed -i "/^additional_arguments =*/ s/$/ panic=3 nmi_watchdog=1 quiet/" %{SOURCE3} sed -i "/^additional_arguments =*/ s/$/ crashkernel=512M/" %{SOURCE5} %endif @@ -317,6 +316,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Sat Jun 22 2024 sunhai - 36.16.5-36 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: adjust some requires and config for derived os + * Wed Jun 19 2024 yueyuankun - 36.16.5-35 - Type:bugfix - ID:NA