From d7f05f21248dda47d23b1ee93b28a15c0c81fe19 Mon Sep 17 00:00:00 2001 From: longcheng Date: Fri, 29 Jul 2022 17:57:27 +0800 Subject: [PATCH] remove sendto option in computer trash and root folder and remove %{?dist} and remove Requires: beesu for caja-beesu (cherry picked from commit 24ec7c46bfdeb5bed67bea42173c95ffb38e06d4) --- ...tion-in-computer-trash-and-root-fold.patch | 43 +++++++++++++++++++ caja-extensions.spec | 12 ++++-- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 0001-remove-sendto-option-in-computer-trash-and-root-fold.patch diff --git a/0001-remove-sendto-option-in-computer-trash-and-root-fold.patch b/0001-remove-sendto-option-in-computer-trash-and-root-fold.patch new file mode 100644 index 0000000..ecc0e43 --- /dev/null +++ b/0001-remove-sendto-option-in-computer-trash-and-root-fold.patch @@ -0,0 +1,43 @@ +From ba39a734d7345ea6f6a3e56ee950f6e4406b597d Mon Sep 17 00:00:00 2001 +From: root +Date: Fri, 31 Jul 2020 09:55:24 +0800 +Subject: [PATCH] =?UTF-8?q?remove=20sendto=20option=20in=20computer=20tras?= + =?UTF-8?q?h=20and=20root=20folder=20-=20=E5=9C=A8=E8=AE=A1=E7=AE=97?= + =?UTF-8?q?=E6=9C=BA=E5=9B=9E=E6=94=B6=E7=AB=99=E4=B8=8E=E4=B8=BB=E6=96=87?= + =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E4=B8=AD=E7=A7=BB=E9=99=A4=E4=BA=86=E5=8F=91?= + =?UTF-8?q?=E9=80=81=E5=88=B0=E9=80=89=E9=A1=B9?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + sendto/caja-nste.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/sendto/caja-nste.c b/sendto/caja-nste.c +index 9814f74..c14f4df 100644 +--- a/sendto/caja-nste.c ++++ b/sendto/caja-nste.c +@@ -67,10 +67,19 @@ caja_nste_get_file_items (CajaMenuProvider *provider, + GList *items = NULL; + gboolean one_item; + CajaMenuItem *item; ++ GList *scan = NULL; + + if (files == NULL) + return NULL; + ++ for (scan = files; scan; scan = scan->next) { ++ CajaFileInfo *file = scan->data; ++ if(caja_file_info_get_file_type(file)==G_FILE_TYPE_SHORTCUT|| ++ caja_file_info_get_file_type(file)==G_FILE_TYPE_MOUNTABLE) ++ return NULL; ++ } ++ ++ + one_item = (files != NULL) && (files->next == NULL); + if (one_item && + !caja_file_info_is_directory ((CajaFileInfo *)files->data)) { +-- +2.18.1 + diff --git a/caja-extensions.spec b/caja-extensions.spec index 129dc2f..75273ea 100644 --- a/caja-extensions.spec +++ b/caja-extensions.spec @@ -16,9 +16,9 @@ Name: caja-extensions Summary: Set of extensions for caja file manager Version: %{branch}.1 %if 0%{?rel_build} -Release: 1%{?dist} +Release: 2 %else -Release: 0.12%{?git_rel}%{?dist} +Release: 0.12%{?git_rel} %endif License: GPLv2+ URL: http://mate-desktop.org @@ -34,6 +34,8 @@ Source2: caja-share-smb.conf.example Patch0: caja-extensions_use-beesu-command-for-gksu.patch +Patch1001: 0001-remove-sendto-option-in-computer-trash-and-root-fold.patch + BuildRequires: mate-common BuildRequires: caja-devel BuildRequires: mate-desktop-devel @@ -100,7 +102,6 @@ sharing via Samba (CIFS protocol) in *NIX systems. %package -n caja-beesu Summary: MATE file manager beesu Requires: %{name}-common = %{version}-%{release} -Requires: beesu %description -n caja-beesu Caja beesu extension for open files as superuser @@ -220,6 +221,11 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ %changelog +* Fri Jul 29 2022 longcheng - 1.22.1-2 +- remove %{?dist} +- remove Requires: beesu for caja-beesu +- remove sendto option in computer trash and root folder (#27922) + * Wed Sep 18 2019 Wolfgang Ulbrich - 1.22.1-1 - update to 1.22.1