From c5cd485814105d54c4e8d138215f8ec8a40ae496 Mon Sep 17 00:00:00 2001 From: lw520203 <1823363429@qq.com> Date: Tue, 25 Feb 2025 18:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A025.03=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0016-add-25.03-release-dependency | 28 ++++++++++++++++++++++++++++ calamares.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0016-add-25.03-release-dependency diff --git a/0016-add-25.03-release-dependency b/0016-add-25.03-release-dependency new file mode 100644 index 0000000..32a7939 --- /dev/null +++ b/0016-add-25.03-release-dependency @@ -0,0 +1,28 @@ +From 5c908db42865807feb765b99326932fc83729e4e Mon Sep 17 00:00:00 2001 +From: lw520203 <1823363429@qq.com> +Date: Tue, 25 Feb 2025 18:23:12 +0800 +Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E25.03=E4=BE=9D=E8=B5=96?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/modules/packagechooser/packagechooser.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf +index 3f356382e..ec0f985f7 100644 +--- a/src/modules/packagechooser/packagechooser.conf ++++ b/src/modules/packagechooser/packagechooser.conf +@@ -165,7 +165,7 @@ items: + # description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks." + # screenshot: ":/images/Plasma.png" + - id: gnome +- packages: [ checkpolicy, code, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts ] ++ packages: [ checkpolicy, code, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, kmail-account-wizard, aknoadi-import-wizard, akonadi-import-wizard-devel, pim-data-exporter, pim-data-exporter-libs, grantlee-editor-libs, grantlee-editor, polkit-qt, polkit-qt5-1, polkit-qt5-1-devel, python3-kolabformat, java-kolabformat, libkolabxml, php-kolabformat, libkolabxml-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, oemaker, isocut, envmaker, kmail, kmail-libs, pim-sieve-editor, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, kdepim-runtime-libs, kdepim-runtime, rust-ripgrep ] + name: DevStation + name[zh]: DevStation + description: GNU Networked Object Modeling Environment Desktop +-- +2.46.0 + diff --git a/calamares.spec b/calamares.spec index b6d198b..15cdef5 100644 --- a/calamares.spec +++ b/calamares.spec @@ -2,7 +2,7 @@ Name: calamares Version: 3.3.7 -Release: 5 +Release: 6 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later @@ -57,6 +57,7 @@ Patch11: 0012-replace-icon.patch Patch12: 0013-1230.patch Patch13: 0014-setRepoSource.patch Patch14: 0015-requireDiskScan.patch +Patch15: 0016-add-25.03-release-dependency # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the arches where grub2-efi is used to boot the system @@ -349,6 +350,9 @@ cd %{_builddir} || exit 0 rm -rf %{buildroot} %changelog +* Fri Feb 28 2025 Liu Wang <1823363429@qq.com> - 3.3.7-6 +- Add 25.03 release dependency + * Thu Feb 27 2025 Li Zixin <2271170409@qq.com> - 3.3.7-5 - Update calamares.service -- Gitee