OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=15

nemo-extensions.changes

@@ -1,13 +1,15 @@
 -------------------------------------------------------------------
 Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru
 
-- Update to 2.8.x.
+- Update to 2.8.0.
 - Build and install sections generalisation.
 - Rename every extension package from nemo-foo to nemo-extension-foo.
 - Add nemo-extension-audio-tab package.
 - Remove nemo-extensions metapackage.
 - Add nemo-dropbox_no-dropbox-bin.patch: strip dropbox binary
   installation, and make nemo-extension-dropbox depend on dropbox.
+- Add nemo-terminal_vte-2.91.patch.
+- Use pygobject-3.0 instead of pygobject-2.0.
 - Generate Python bytecode.
 
 -------------------------------------------------------------------

nemo-extensions.spec

@@ -16,19 +16,21 @@
 #
 
 
-%define _version 2.8.0
+%define _version 2.8.x
 Name:           nemo-extensions
-Version:        2.8.x
+Version:        2.8.0
 Release:        0
 Summary:        Set of extensions for Nemo, the Cinnamon file manager
 License:        GPL-3.0+ and GPL-3.0
 Group:          System/GUI/Other
 Url:            https://github.com/linuxmint/nemo-extensions
-Source:         https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:         https://github.com/linuxmint/%{name}/archive/%{_version}.tar.gz#/%{name}-%{_version}.tar.gz
 # PATCH-FIX-UPSTREAM nemo-seahorse_gpg-2.1.patch stefan@fam-elser.de -- Add patch for GPG 2.1.
 Patch0:         nemo-seahorse_gpg-2.1.patch
+# PATCH-FIX-UPSTREAM nemo-terminal_vte-2.91.patch
+Patch1:         nemo-terminal_vte-2.91.patch
 # PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation.
-Patch1:         nemo-dropbox_no-dropbox-bin.patch
+Patch2:         nemo-dropbox_no-dropbox-bin.patch
 BuildRequires:  docutils
 BuildRequires:  gettext-runtime
 BuildRequires:  gnome-common
@@ -62,7 +64,7 @@ BuildRequires:  pkgconfig(libmusicbrainz5)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(nettle)
 BuildRequires:  pkgconfig(nss)
-BuildRequires:  pkgconfig(pygobject-2.0)
+BuildRequires:  pkgconfig(pygobject-3.0)
 BuildRequires:  pkgconfig(webkitgtk-3.0)
 %if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
 BuildRequires:  mbedtls-devel
@@ -331,9 +333,10 @@ hotkey (default F4) and automatically follows the currently active
 directory in Nemo.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_version}
 %patch0
 %patch1
+%patch2
 # Remove spurious executable permission.
 chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3
 

nemo-terminal_vte-2.91.patch

@@ -0,0 +1,22 @@
+--- nemo-terminal.orig/src/nemo_terminal.py
++++ nemo-terminal/src/nemo_terminal.py
+@@ -50,7 +50,6 @@ gettext.textdomain('nemo-terminal')
+ _ = gettext.gettext
+ 
+ import gi
+-gi.require_version('Vte', '2.90')
+ from gi.repository import GObject, Nemo, Gtk, Gdk, Vte, GLib, Gio
+ 
+ # DEFAULT_CONF = {
+@@ -86,7 +85,10 @@ class NemoTerminal(object):
+         self.shell_pid = -1
+         self.term = Vte.Terminal()
+ 
+-        self.shell_pid = self.term.fork_command_full(Vte.PtyFlags.DEFAULT,
++        term_spawn_cmd = "fork_command_full"
++        if (hasattr(self.term, "spawn_sync")):
++                term_spawn_cmd = "spawn_sync"
++        self.shell_pid = getattr(self.term, term_spawn_cmd)(Vte.PtyFlags.DEFAULT,
+                 self._path, [terminal_or_default()], None,
+                 GLib.SpawnFlags.SEARCH_PATH, None, None)[1]
+         # Make vte.sh active