diff --git a/fix_terminal.patch b/fix_terminal.patch deleted file mode 100644 index 8ba7a73..0000000 --- a/fix_terminal.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -uNrp nemo-old/libnemo-private/nemo-global-preferences.h nemo-new/libnemo-private/nemo-global-preferences.h ---- nemo-old/libnemo-private/nemo-global-preferences.h 2018-02-05 19:57:39.000000000 +0000 -+++ nemo-new/libnemo-private/nemo-global-preferences.h 2018-02-05 21:41:00.901076925 +0000 -@@ -234,7 +234,6 @@ typedef enum - - /* Terminal */ - #define GNOME_DESKTOP_TERMINAL_EXEC "exec" --#define GNOME_DESKTOP_TERMINAL_EXEC_ARG "exec-arg" - - /* Tooltips */ - #define NEMO_PREFERENCES_TOOLTIPS_DESKTOP "tooltips-on-desktop" -diff -uNrp nemo-old/src/nemo-view.c nemo-new/src/nemo-view.c ---- nemo-old/src/nemo-view.c 2018-02-05 19:57:39.000000000 +0000 -+++ nemo-new/src/nemo-view.c 2018-02-05 21:42:35.030326061 +0000 -@@ -7125,12 +7125,10 @@ open_as_root (const gchar *path) - static void - open_in_terminal (const gchar *path) - { -- gchar *argv[3]; -+ gchar *argv[2]; - argv[0] = g_settings_get_string (gnome_terminal_preferences, - GNOME_DESKTOP_TERMINAL_EXEC); -- argv[1] = g_settings_get_string (gnome_terminal_preferences, -- GNOME_DESKTOP_TERMINAL_EXEC_ARG); -- argv[2] = NULL; -+ argv[1] = NULL; - g_spawn_async(path, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); - } - -diff -uNrp nemo-old/src/nemo-window-menus.c nemo-new/src/nemo-window-menus.c ---- nemo-old/src/nemo-window-menus.c 2018-02-05 19:57:39.000000000 +0000 -+++ nemo-new/src/nemo-window-menus.c 2018-02-05 21:44:07.871589433 +0000 -@@ -1161,10 +1161,9 @@ action_new_folder_callback (GtkAction *a - static void - open_in_terminal_other (const gchar *path) - { -- gchar *argv[3]; -+ gchar *argv[2]; - argv[0] = g_settings_get_string (gnome_terminal_preferences, GNOME_DESKTOP_TERMINAL_EXEC); -- argv[1] = g_settings_get_string (gnome_terminal_preferences, GNOME_DESKTOP_TERMINAL_EXEC_ARG); -- argv[2] = NULL; -+ argv[1] = NULL; - g_spawn_async(path, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); - } - diff --git a/meson.patch b/meson.patch deleted file mode 100644 index 89667aa..0000000 --- a/meson.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -146,7 +146,7 @@ rootInclude = include_directories('.') - nemoDataPath = join_paths(get_option('prefix'), get_option('datadir'), 'nemo') - libExecPath = join_paths(get_option('prefix'), get_option('libexecdir')) - # Keep this constant, in case some extensions are behind in being updated... --nemoExtensionPath = join_paths(get_option('prefix'), 'lib', 'nemo', 'extensions-3.0') -+nemoExtensionPath = join_paths(get_option('prefix'), get_option('libdir'), 'nemo', 'extensions-3.0') - - nemo_definitions = [ - '-DNEMO_DATADIR="@0@"'.format(nemoDataPath), diff --git a/nemo.spec b/nemo.spec index 1fd9389..1d7404d 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,19 +1,17 @@ -%global commit 1a20ae1bbb1969a34ce05e19495a54be1abd824d -%global date 20180205 +%global commit a5bf0159ab8e3f199854fb36a48d0f36cbdf5871 +%global date 20180206 %global shortcommit0 %(c=%{commit}; echo ${c:0:7}) Name: nemo Summary: File manager for Cinnamon Version: 3.6.6 -Release: 0.3%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 0.4%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/ Source0: %url/%{name}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz Source1: nemo-fedora.gschema.override Patch0: remove_desktop_search.patch Patch1: Don-t-scale-text-size-when-zooming.patch -Patch2: meson.patch -Patch3: fix_terminal.patch Requires: redhat-menus Requires: gvfs%{_isa} @@ -162,6 +160,9 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Tue Feb 06 2018 Leigh Scott - 3.6.6-0.4.20180206gita5bf015 +- update to git snapshot + * Mon Feb 05 2018 Leigh Scott - 3.6.6-0.3.20180205git1a20ae1 - Fix some minor issues diff --git a/sources b/sources index 3285306..dae40b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nemo-1a20ae1bbb1969a34ce05e19495a54be1abd824d.tar.gz) = 97a1b112e2e441774072868f86a11617bb190b82e4c4304cc71fcbaec65821bcbe36e39e46c8069b776b7bf8c965bb715afeb616131d3513ff18fd8c56d06109 +SHA512 (nemo-a5bf0159ab8e3f199854fb36a48d0f36cbdf5871.tar.gz) = 819ab55b768f2545e9831010a965dd10c087b49db4e32ba7a4d6e1ecdd54a688e83b0930def09b97f8961ade6edd348262805b43df496cf82d0165e8c9409eed