From 60fed3be6452227750eb4475b207288c5178efe4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Aug 03 2021 11:33:20 +0000 Subject: Update to 41.alpha --- diff --git a/.gitignore b/.gitignore index e200e99..565cea4 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-40.rc.tar.xz /nautilus-40.0.tar.xz /nautilus-40.1.tar.xz +/nautilus-41.alpha.tar.xz diff --git a/664.patch b/664.patch deleted file mode 100644 index ca836d8..0000000 --- a/664.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3e03a8b05258cf88bd61c61e3ac599103d464b38 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= -Date: Sat, 1 May 2021 23:54:43 +0100 -Subject: [PATCH] files-view: Set PWD to current dir to run scripts - -When running an executable text file as a program, it's reasonable to -expect that the directory currently displayed by the file browser -becomes the current working directory for that program. This used to be -handled correctly by the activation action. - -While taking "Run as a Program" out of activation into a standalone -action, this behavior was left behind. - -Let's add it back to the standalone action to fix the regression. - -Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/1842 ---- - src/nautilus-files-view.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index 250c37264..e027f10e0 100644 ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -6619,6 +6619,7 @@ action_run_in_terminal (GSimpleAction *action, - { - NautilusFilesView *view; - g_autolist (NautilusFile) selection = NULL; -+ g_autofree char *old_working_dir = NULL; - g_autofree char *uri = NULL; - g_autofree char *executable_path = NULL; - g_autofree char *quoted_path = NULL; -@@ -6636,6 +6637,8 @@ action_run_in_terminal (GSimpleAction *action, - return; - } - -+ old_working_dir = change_to_view_directory (view); -+ - uri = nautilus_file_get_activation_uri (NAUTILUS_FILE (selection->data)); - executable_path = g_filename_from_uri (uri, NULL, NULL); - quoted_path = g_shell_quote (executable_path); -@@ -6646,6 +6649,8 @@ action_run_in_terminal (GSimpleAction *action, - DEBUG ("Launching in terminal %s", quoted_path); - - nautilus_launch_application_from_command (screen, quoted_path, TRUE, NULL); -+ -+ g_chdir (old_working_dir); - } - - #define BG_KEY_PRIMARY_COLOR "primary-color" --- -GitLab - diff --git a/nautilus.spec b/nautilus.spec index cd7c3fe..818d8c9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -5,17 +5,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: nautilus -Version: 40.1 -Release: 4%{?dist} +Version: 41~alpha +Release: 1%{?dist} Summary: File manager for GNOME License: GPLv3+ URL: https://wiki.gnome.org/Apps/Nautilus -Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz - -# Backported from upstream -# https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/664 -Patch0: 664.patch +Source0: https://download.gnome.org/sources/%{name}/41.alpha/%{name}-%{tarball_version}.tar.xz BuildRequires: desktop-file-utils BuildRequires: gcc @@ -147,6 +143,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %doc %{_datadir}/gtk-doc/html/libnautilus-extension/ %changelog +* Tue Aug 03 2021 Kalev Lember - 41~alpha-1 +- Update to 41.alpha + * Thu Jul 22 2021 Fedora Release Engineering - 40.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 4fa21a3..be1d52c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nautilus-40.1.tar.xz) = 6421ce0c30c6f3a406a9c100b4a62e01276b10b6cdf05c9aa862a0ece89c7d231e8d3630aecfb8a1e6b40d62849c80c6c91b3f6b6663251466aa8865e60dbfc1 +SHA512 (nautilus-41.alpha.tar.xz) = e7756adeb33dfb59faaf7f0d746136c078ed04235ef11bca0ea37efc1944045a3ca9118673a0d8444d1434371fe8f74c506d6e9394f437da1da964ea103eb657