From 19c035bf166510033a4f6890450dca1ad53b3dcd Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Fri, 10 Dec 2021 15:24:16 +0800 Subject: [PATCH 1/2] Modify the require isoft-menus to openEuler-menus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改isoft-menus为openEuler-menus Signed-off-by: tangjie02 --- caja.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/caja.spec b/caja.spec index 9ef6fd7..bfe1efa 100644 --- a/caja.spec +++ b/caja.spec @@ -16,9 +16,9 @@ Name: caja Summary: File manager for MATE Version: %{branch}.2 %if 0%{?rel_build} -Release: 6 +Release: 7 %else -Release: 0.11%{?git_rel}%{?dist} +Release: 0.12%{?git_rel}%{?dist} %endif License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -58,7 +58,7 @@ BuildRequires: libnotify-devel Requires: gamin Requires: filesystem -Requires: isoft-menus +Requires: openEuler-menus Requires: gvfs # the main binary links against libcaja-extension.so @@ -196,6 +196,9 @@ EOF %changelog +* Fri Dec 10 2021 tangjie02 - 1.22.2-7 +- Modify the require isoft-menus to openEuler-menus + * Thu May 27 2021 xianzhao Yang - 1.22.6 - Optimize search tools Optimize startup window position and add some Chinese files -- Gitee From 9984a5625612ae2f4790d2b05c25017380cdf8f9 Mon Sep 17 00:00:00 2001 From: tangjie02 Date: Mon, 13 Dec 2021 14:09:12 +0800 Subject: [PATCH 2/2] Allow root user to use desktop manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 运行caja在root用户下管理桌面和桌面图标 Signed-off-by: tangjie02 --- 0001-allow-root-to-use-desktop-manager.patch | 26 ++++++++++++++++++++ caja.spec | 9 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0001-allow-root-to-use-desktop-manager.patch diff --git a/0001-allow-root-to-use-desktop-manager.patch b/0001-allow-root-to-use-desktop-manager.patch new file mode 100644 index 0000000..1f03d6d --- /dev/null +++ b/0001-allow-root-to-use-desktop-manager.patch @@ -0,0 +1,26 @@ +From b081e9b4b21113e74e497df6d8ca92b2a41f16bc Mon Sep 17 00:00:00 2001 +From: tangjie02 +Date: Mon, 13 Dec 2021 14:06:04 +0800 +Subject: [PATCH] allow root to use desktop manager + +Signed-off-by: tangjie02 +--- + src/caja-application.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/caja-application.c b/src/caja-application.c +index 090c3dd..d8c7acd 100644 +--- a/src/caja-application.c ++++ b/src/caja-application.c +@@ -2293,7 +2293,7 @@ init_desktop (CajaApplication *self) + self->priv->no_desktop = TRUE; + } + +- if (running_as_root () || !running_in_mate ()) ++ if (!running_in_mate ()) + { + /* do not manage desktop when running as root or on other desktops unless forced */ + self->priv->no_desktop = TRUE; +-- +2.27.0 + diff --git a/caja.spec b/caja.spec index bfe1efa..4a38a28 100644 --- a/caja.spec +++ b/caja.spec @@ -16,9 +16,9 @@ Name: caja Summary: File manager for MATE Version: %{branch}.2 %if 0%{?rel_build} -Release: 7 +Release: 8 %else -Release: 0.12%{?git_rel}%{?dist} +Release: 0.13%{?git_rel}%{?dist} %endif License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -41,6 +41,8 @@ Patch5: caja-1.22.2-mate-search-tool.patch Patch6: caja-1.22.2-trash-translate.patch +Patch7: 0001-allow-root-to-use-desktop-manager.patch + BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: exempi-devel @@ -196,6 +198,9 @@ EOF %changelog +* Mon Dec 13 2021 tangjie02 - 1.22.2-8 +- Allow root user to use desktop manager + * Fri Dec 10 2021 tangjie02 - 1.22.2-7 - Modify the require isoft-menus to openEuler-menus -- Gitee