diff --git a/anaconda.spec b/anaconda.spec index 42b7177..cecbbe6 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 30 +Release: 31 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -57,6 +57,7 @@ Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch Patch9025: bugfix-import-new-BlockDev.patch +Patch9026: bugfix-fix-custom-storage-chinese-tip.patch %define dasbusver 1.3 %define dbusver 1.2.3 @@ -85,7 +86,7 @@ BuildRequires: glade-devel libgnomekbd-devel libxklavier-devel >= %{libxklavierv BuildRequires: make BuildRequires: python3-kickstart >= %{pykickstartver} python3-devel systemd BuildRequires: rpm-devel >= %{rpmver} libarchive-devel >= %{libarchivever} gdk-pixbuf2-devel -BuildRequires: libxml2 +BuildRequires: libxml2-devel BuildRequires: gsettings-desktop-schemas metacity Requires: anaconda-core = %{version}-%{release} @@ -312,17 +313,26 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Wed Apr 03 2024 sunhai - 36.16.5-30 +* Sat Apr 20 2024 sunhai - 36.16.5-31 - Type:bugfix - ID:NA - SUG:NA -- DESC: ignore nvme-cli +- DESC: config adjust + revise hostname chinese tip -* Tue Mar 26 2024 sunhai - 36.16.5-29 +* Tue Apr 09 2024 sunhai - 36.16.5-30 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix custom storage chinese tip + +* Tue Apr 09 2024 sunhai - 36.16.5-29 - Type:bugfix - ID:NA - SUG:NA - DESC: fix lost ntfsprogs + fix lost nvme-cli + fix BuildRequires * Thu Feb 29 2024 sunhai - 36.16.5-28 - Type:bugfix diff --git a/bugfix-fix-custom-storage-chinese-tip.patch b/bugfix-fix-custom-storage-chinese-tip.patch new file mode 100644 index 0000000..b209f43 --- /dev/null +++ b/bugfix-fix-custom-storage-chinese-tip.patch @@ -0,0 +1,44 @@ +From 043c6ba5f0e9d97fed947246dfd65f5cfd5d251e Mon Sep 17 00:00:00 2001 +From: s30028044 +Date: Sat, 13 Apr 2024 17:00:13 +0800 +Subject: [PATCH] fix custom storage chinese tip + +--- + po/zh_CN.po | 6 +++--- + pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index ce63959..6a854c7 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1627,10 +1627,10 @@ msgid "" + "'512m' = 512 megabytes\n" + "'123456789' = 123 terabytes and a bit less than a half\n" + msgstr "" +-"请以整数或十进制小数指定期望容量，并带上合适的单位。\n" ++"请使用整数或小数指定所需容量以及可以带上合适的单位。\n" + "\n" +-"不允许以空格分隔的数字组。单位包括十进制前缀或二进制前缀，以及可选的字母 B。" +-"单位对字母的大小写不敏感。如果省略单位，则默认的单位是 MiB。\n" ++"但不允许使用空格将数字分隔成数组。单位由十进制或二进制的计数单位，以及可选字母B组成。" ++"单位会忽略字母大小写，并且缺省单位是 MiB。\n" + "\n" + "有效输入的例子：\n" + "“100GiB” = 100 Gibibytes\n" +diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py +index 81bb793..d374fcf 100644 +--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py ++++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py +@@ -255,7 +255,7 @@ class AddDialog(GUIObject): + self._warning_label = self.builder.get_object("mountPointWarningLabel") + + self._size_entry = self.builder.get_object("addSizeEntry") +- self._size_entry.set_tooltip_text(DESIRED_CAPACITY_HINT) ++ self._size_entry.set_tooltip_text(_(DESIRED_CAPACITY_HINT)) + + self._populate_mount_points() + +-- +2.27.0 + diff --git a/euleros.conf b/euleros.conf index d9b4339..ae8f34d 100644 --- a/euleros.conf +++ b/euleros.conf @@ -6,8 +6,7 @@ profile_id = EulerOS [Profile Detection] # Match os-release values. -os_id = EulerOS -variant_id = server +os_id = euleros [Installation System] can_detect_enabled_smt = False diff --git a/fix-hostname-info.patch b/fix-hostname-info.patch index a217dca..77fecd9 100644 --- a/fix-hostname-info.patch +++ b/fix-hostname-info.patch @@ -24,7 +24,7 @@ index 18b0925..c2216e6 100644 msgstr "" "主机名只能包含 'a-z'、'A-Z'、 '0-9'、 '-'（英文减号），或者 '.'（英文点号），" -"其中两个点号中不能为空且不能以 '-' 开头或结尾。" -+"其中两个点号中不能为空，必须少于64个字符且不能以'.'和'-'开头或结尾。" ++"其中符号不能连接在一起，需用数字或字母隔开，整体长度必须少于64个字符且不能以'.'和'-'开头或结尾。" #: pyanaconda/network.py:457 msgid "Status not available" diff --git a/hce.conf b/hce.conf index b2f2176..e44e30c 100644 --- a/hce.conf +++ b/hce.conf @@ -6,8 +6,7 @@ profile_id = HCE [Profile Detection] # Match os-release values. -os_id = HCE -variant_id = server +os_id = hce [Installation System] can_detect_enabled_smt = False