!36 Modify the require redhat-menus to openEuler-menus and Allow root to use desktop manager

Merge pull request !36 from kylinsecos/master

0001-allow-root-to-use-desktop-manager.patch

@@ -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
+

caja.spec

@@ -18,7 +18,7 @@ Version:     %{branch}.1
 %if 0%{?rel_build}
 Release:     2
 %else
-Release:     0.14%{?git_rel}%{?dist}
+Release:     0.15%{?git_rel}%{?dist}
 %endif
 License:     GPLv2+ and LGPLv2+
 URL:         http://mate-desktop.org
@@ -30,6 +30,7 @@ URL:         http://mate-desktop.org
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
 Patch0:        caja_add-xfce-to-desktop-file-1.25.patch
+Patch1:	       0001-allow-root-to-use-desktop-manager.patch
 
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
@@ -48,7 +49,7 @@ BuildRequires: startup-notification-devel
 BuildRequires: libnotify-devel
 
 Requires:   filesystem
-Requires:   redhat-menus
+Requires:   openEuler-menus
 Requires:   gvfs
 
 # the main binary links against libcaja-extension.so
@@ -181,6 +182,10 @@ EOF
 
 
 %changelog
+* Tue Jan 25 2022 longcheng <longcheng@kylinos.com.cn> - 1.24.1-2
+- Modify the require redhat-menus to openEuler-menus
+- Allow root to use desktop manager
+
 * Thu Mar 25 2021 Wolfgang Ulbrich <fedora@raveit.de> - 1.24.1-1
 - update to 1.24.1