Merge branch 'master' into openEuler-22.03-LTS-Next

caja.spec

@@ -16,9 +16,9 @@ Name:        caja
 Summary:     File manager for MATE
 Version:     %{branch}.1
 %if 0%{?rel_build}
-Release:     5
+Release:     6
 %else
-Release:     0.15%{?git_rel}%{?dist}
+Release:     0.15%{?git_rel}
 %endif
 License:     GPLv2+ and LGPLv2+
 URL:         http://mate-desktop.org
@@ -184,6 +184,9 @@ EOF
 
 
 %changelog
+* Thu Jun 23 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 1.24.1-6
+- Remove %{?dist}
+
 * Thu Jun 23 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 1.24.1-5
 - Support kiran desktop environment.
 - Caja not register for root in MATE desktop before session manager timeout