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

@@ -1,26 +0,0 @@
-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

@@ -16,9 +16,9 @@ Name:        caja
 Summary:     File manager for MATE
 Version:     %{branch}.2
 %if 0%{?rel_build}
-Release:     11
+Release:     7
 %else
-Release:     0.16%{?git_rel}%{?dist}
+Release:     0.12%{?git_rel}%{?dist}
 %endif
 License:     GPLv2+ and LGPLv2+
 URL:         http://mate-desktop.org
@@ -41,8 +41,6 @@ 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
@@ -65,7 +63,7 @@ Requires:   gvfs
 
 # the main binary links against libcaja-extension.so
 # don't depend on soname, rather on exact version
-Requires:       %{name}-extensions%{?_isa} = %{version}-%{release}
+Requires:       %{name}-extensions-common
 
 # needed for using mate-text-editor as stanalone in another DE
 Requires:       %{name}-schemas%{?_isa} = %{version}-%{release}
@@ -81,7 +79,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) || 0%{?openEuler} >= 1
+%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32)
 Provides: %{name}-extensions = %{version}-%{release}
 Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-extensions < 1.20.2-2
@@ -198,25 +196,13 @@ 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 Mar 15 2021 xianzhao Yang  <xianzhao.yang@i-soft.com.cn> - 1.22.3
+* Mon Fri 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