diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-11-17 03:03:15 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-11-17 03:03:15 +0000 |
| commit | 335bef305fa6aecd325dd04a6fdecf64daf267f5 (patch) | |
| tree | 5ce61f5d288dab6593b22974b6e1d7c6c85ee73a | |
| parent | 9f313a25e8ba9e7b94f5763bb232741b165105d4 (diff) | |
automatic import of gnome-sessionopeneuler24.03_LTS_SP4
| -rw-r--r-- | gnome-session.spec | 15 | ||||
| -rw-r--r-- | sources | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gnome-session.spec b/gnome-session.spec index cda6ea7..9387bcc 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -2,7 +2,7 @@ Name: gnome-session Version: 51.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME session manager License: GPL-2.0-or-later URL: https://github.com/GNOME/gnome-session @@ -26,6 +26,8 @@ BuildRequires: systemd-devel Requires: dconf Requires: gsettings-desktop-schemas >= 0.1.7 Requires: dbus +# openEuler 24.03 由 gnome-desktop3 提供 /usr/share/applications/gnome-mimeapps.list +Requires: gnome-desktop3 Requires: gnome-shell Obsoletes: %{name}-xsession < %{version}-%{release} @@ -52,9 +54,13 @@ Desktop file to add GNOME on Wayland to the display manager session menu. %autosetup -p1 %build +# GNOME 45+ 上游把 gnome-mimeapps.list 从 gnome-desktop 迁到 gnome-session, +# 但 openEuler 24.03 的 gnome-desktop3 仍提供该文件,同时安装会产生文件冲突, +# 故禁用本包自带副本,改用 gnome-desktop3 提供的版本 %meson \ -Ddocbook=true \ - -Dman=true + -Dman=true \ + -Dmimeapps=false %meson_build %install @@ -80,13 +86,16 @@ Desktop file to add GNOME on Wayland to the display manager session menu. %{_userunitdir}/gnome-session* %{_userunitdir}/app-flatpak-.scope.d/override.conf %{_userunitdir}/app-gnome-.scope.d/override.conf -%{_datadir}/applications/gnome-mimeapps.list %files help %doc README.md %{_datadir}/doc/gnome-session/html %changelog +* Tue Nov 17 2026 AI Import <ai-importer@openeuler.org> - 51.0-2 +- Drop bundled gnome-mimeapps.list to avoid file conflict with gnome-desktop3 +- Require gnome-desktop3 which provides gnome-mimeapps.list on openEuler 24.03 + * Tue Nov 17 2026 AI Import <ai-importer@openeuler.org> - 51.0-1 - Update to upstream version 51.0 - Adapt to GLib 2.78 shipped in openEuler 24.03 LTS @@ -1 +1 @@ -2568744c67e05560a7c7853317721aa6 gnome-session-51.0.tar.gz +c686602da34506167006f8e16a19b94b gnome-session-51.0.tar.gz |
