Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
33d7139e50
!62 【轻量级 PR】:fix bad date in changelog
From: @zhangshaoning_uniontech 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
2024-07-08 07:27:01 +00:00
张少宁
987be7a205
fix bad date in changelog
Signed-off-by: 张少宁 <zhangshaoning@uniontech.com>
2024-06-17 01:55:30 +00:00
openeuler-ci-bot
c6283d1e74 !35 [sync] PR-34: Modify the expression 0%{?openEuler} >= 2 to 0%{?openEuler} >= 1
Merge pull request !35 from openeuler-sync-bot/sync-pr34-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3
2021-12-14 12:27:58 +00:00
tangjie02
cd2a686d4a Modify the expression 0%{?openEuler} >= 2 to 0%{?openEuler} >= 1
(cherry picked from commit 1974c412c02e4131afd0c8599419b9939e52b2ee)
2021-12-14 20:25:19 +08:00
openeuler-ci-bot
ce9257d092 !33 [sync] PR-32: Fix circular dependency
Merge pull request !33 from openeuler-sync-bot/sync-pr32-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3
2021-12-14 10:07:38 +00:00
tangjie02
eb1ca16643 Fix circular dependency
- 修复循环依赖问题

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
(cherry picked from commit f7f6866efd9ae18ca06b792abc41468f5d4e710c)
2021-12-14 18:05:51 +08:00
openeuler-ci-bot
279e885f50 !31 [sync] PR-30: Fix circular dependency
Merge pull request !31 from openeuler-sync-bot/sync-pr30-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3
2021-12-14 06:52:40 +00:00
tangjie02
0c96b9e16e Fix circular dependency
- 修复循环依赖问题

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
(cherry picked from commit 0864c5bfaa17fc3119b12ebd82862a5f806ac865)
2021-12-14 14:25:23 +08:00
openeuler-ci-bot
c899db8ea5 !29 [sync] PR-28: Allow root user to use desktop manager
Merge pull request !29 from openeuler-sync-bot/sync-pr28-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3
2021-12-14 01:41:46 +00:00
tangjie02
d9c09b23c9 Allow root user to use desktop manager
- 运行caja在root用户下管理桌面和桌面图标

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
(cherry picked from commit 9984a5625612ae2f4790d2b05c25017380cdf8f9)
2021-12-13 14:56:36 +08:00
2 changed files with 45 additions and 5 deletions

View File

@ -0,0 +1,26 @@
From b081e9b4b21113e74e497df6d8ca92b2a41f16bc Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Mon, 13 Dec 2021 14:06:04 +0800
Subject: [PATCH] allow root to use desktop manager
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
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

View File

@ -16,9 +16,9 @@ Name: caja
Summary: File manager for MATE
Version: %{branch}.2
%if 0%{?rel_build}
Release: 7
Release: 11
%else
Release: 0.12%{?git_rel}%{?dist}
Release: 0.16%{?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
@ -63,7 +65,7 @@ Requires: gvfs
# the main binary links against libcaja-extension.so
# don't depend on soname, rather on exact version
Requires: %{name}-extensions-common
Requires: %{name}-extensions%{?_isa} = %{version}-%{release}
# needed for using mate-text-editor as stanalone in another DE
Requires: %{name}-schemas%{?_isa} = %{version}-%{release}
@ -79,7 +81,7 @@ It is also responsible for handling the icons on the MATE desktop.
%package core-extensions
Summary: Mate-file-manager extensions library
Requires: %{name}%{?_isa} = %{version}-%{release}
%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32)
%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32) || 0%{?openEuler} >= 1
Provides: %{name}-extensions = %{version}-%{release}
Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-extensions < 1.20.2-2
@ -196,13 +198,25 @@ EOF
%changelog
* Tue Dec 14 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-11
- Modify the expression 0%{?openEuler} >= 2 to 0%{?openEuler} >= 1
* Tue Dec 14 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-10
- Fix circular dependency.
* Tue Dec 14 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-9
- Fix circular dependency.
* Mon Dec 13 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-8
- Allow root user to use desktop manager
* Fri Dec 10 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-7
- Modify the require isoft-menus to openEuler-menus
* Thu May 27 2021 xianzhao Yang <xianzhao.yang@i-soft.com.cn> - 1.22.6
- Optimize search tools Optimize startup window position and add some Chinese files
* Mon Fri 15 2021 xianzhao Yang <xianzhao.yang@i-soft.com.cn> - 1.22.3
* Mon Mar 15 2021 xianzhao Yang <xianzhao.yang@i-soft.com.cn> - 1.22.3
- Sinicization file
* Fri Nov 22 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-2