From 007594585a00e66e7df3e263a6e3d8113692fdd9 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Feb 05 2018 21:49:08 +0000
Subject: Fix some minor issues


---

diff --git a/fix_terminal.patch b/fix_terminal.patch
new file mode 100644
index 0000000..8ba7a73
--- /dev/null
+++ b/fix_terminal.patch
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 0000000..89667aa
--- /dev/null
+++ b/meson.patch
@@ -0,0 +1,11 @@
+--- 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 f6f33cf..1fd9389 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -5,13 +5,15 @@
 Name:           nemo
 Summary:        File manager for Cinnamon
 Version:        3.6.6
-Release:        0.2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Release:        0.3%{?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}
@@ -160,6 +162,9 @@ fi
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Mon Feb 05 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.6.6-0.3.20180205git1a20ae1
+- Fix some minor issues
+
 * Mon Feb 05 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.6.6-0.2.20180205git1a20ae1
 - update to git snapshot