Compare commits
10 Commits
8e268d502f
...
33d7139e50
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
33d7139e50 | ||
|
|
987be7a205 | ||
|
|
c6283d1e74 | ||
|
|
cd2a686d4a | ||
|
|
ce9257d092 | ||
|
|
eb1ca16643 | ||
|
|
279e885f50 | ||
|
|
0c96b9e16e | ||
|
|
c899db8ea5 | ||
|
|
d9c09b23c9 |
26
0001-allow-root-to-use-desktop-manager.patch
Normal file
26
0001-allow-root-to-use-desktop-manager.patch
Normal 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
|
||||||
|
|
||||||
24
caja.spec
24
caja.spec
@ -16,9 +16,9 @@ Name: caja
|
|||||||
Summary: File manager for MATE
|
Summary: File manager for MATE
|
||||||
Version: %{branch}.2
|
Version: %{branch}.2
|
||||||
%if 0%{?rel_build}
|
%if 0%{?rel_build}
|
||||||
Release: 7
|
Release: 11
|
||||||
%else
|
%else
|
||||||
Release: 0.12%{?git_rel}%{?dist}
|
Release: 0.16%{?git_rel}%{?dist}
|
||||||
%endif
|
%endif
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: http://mate-desktop.org
|
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
|
Patch6: caja-1.22.2-trash-translate.patch
|
||||||
|
|
||||||
|
Patch7: 0001-allow-root-to-use-desktop-manager.patch
|
||||||
|
|
||||||
BuildRequires: dbus-glib-devel
|
BuildRequires: dbus-glib-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: exempi-devel
|
BuildRequires: exempi-devel
|
||||||
@ -63,7 +65,7 @@ Requires: gvfs
|
|||||||
|
|
||||||
# the main binary links against libcaja-extension.so
|
# the main binary links against libcaja-extension.so
|
||||||
# don't depend on soname, rather on exact version
|
# 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
|
# needed for using mate-text-editor as stanalone in another DE
|
||||||
Requires: %{name}-schemas%{?_isa} = %{version}-%{release}
|
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
|
%package core-extensions
|
||||||
Summary: Mate-file-manager extensions library
|
Summary: Mate-file-manager extensions library
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
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 = %{version}-%{release}
|
||||||
Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
|
Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-extensions < 1.20.2-2
|
Obsoletes: %{name}-extensions < 1.20.2-2
|
||||||
@ -196,13 +198,25 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Dec 10 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-7
|
||||||
- Modify the require isoft-menus to openEuler-menus
|
- Modify the require isoft-menus to openEuler-menus
|
||||||
|
|
||||||
* Thu May 27 2021 xianzhao Yang <xianzhao.yang@i-soft.com.cn> - 1.22.6
|
* 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
|
- 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
|
- Sinicization file
|
||||||
|
|
||||||
* Fri Nov 22 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-2
|
* Fri Nov 22 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-2
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user