From c328ccc50d711bda50629c664bd8e6c1c3dbb856500c2d9052c228b17b88603a Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 9 Nov 2016 13:15:30 +0000 Subject: [PATCH 1/2] - Update to version 3.2.0. OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=30 --- nemo-extensions-3.0.0.tar.gz | 3 --- nemo-extensions-3.2.0.tar.gz | 3 +++ nemo-extensions.changes | 26 ++++++++++++++++++++++++++ nemo-extensions.spec | 22 ++++++++-------------- nemo-seahorse_gpg-2.1.patch | 7 ------- nemo-terminal_vte-2.91.patch | 31 ------------------------------- 6 files changed, 37 insertions(+), 55 deletions(-) delete mode 100644 nemo-extensions-3.0.0.tar.gz create mode 100644 nemo-extensions-3.2.0.tar.gz delete mode 100644 nemo-seahorse_gpg-2.1.patch delete mode 100644 nemo-terminal_vte-2.91.patch diff --git a/nemo-extensions-3.0.0.tar.gz b/nemo-extensions-3.0.0.tar.gz deleted file mode 100644 index 1baa902..0000000 --- a/nemo-extensions-3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b62b81d40a268509c5d3be58aed4d232c05433f028a6197a00b2dd0964578605 -size 1161110 diff --git a/nemo-extensions-3.2.0.tar.gz b/nemo-extensions-3.2.0.tar.gz new file mode 100644 index 0000000..f390938 --- /dev/null +++ b/nemo-extensions-3.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1536fd828b2ee0a8f194155a9e13b8cce937b403b5c87d8e579d7b1ced8d6d14 +size 1162843 diff --git a/nemo-extensions.changes b/nemo-extensions.changes index 4cfb832..21101d8 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Nov 8 13:01:41 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 3.2.0 (changes since 3.0.0): + * seahorse: Allow building with gnupg 2.1 + (gh#linuxmint/nemo-extensions#159). + * emblems: Fix a wrong version in setup.py + * nemo-terminal: Add VTE 2.91 support. + * nemo-preview: Fix a deadlock when closing the window, change + the key. + * nemo-preview, image.js: Apply embedded orientation if it exists. + * nemo-preview: Port to ClutterGst 3.0 (restores video playback). + * image-converter: Add more resize sizes. + * nemo-terminal: Clear 'cd' line after changing directory. + * Add support for Nemo's plugin manager. + * nemo-pastebin: Add gi.require_version(). + * nemo-preview, mainWindow.js: move to current desktop before + setting a transient parent. + * nemo-preview, audio: Fix missing import. + * nemo-preview: Fix EXIF rotation. + * nemo-preview: Fix invalid CSS values + (gh#linuxmint/nemo-extensions#189). + * Update translations. +- Remove nemo-seahorse_gpg-2.1.patch, nemo-terminal_vte-2.91.patch: + fixed upstream. + ------------------------------------------------------------------- Wed Oct 5 19:37:54 UTC 2016 - sor.alexei@meowr.ru diff --git a/nemo-extensions.spec b/nemo-extensions.spec index 7f4919c..ea2d309 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -17,25 +17,21 @@ # Do not package nemo-extension-media-columns for now: slows Nemo down. -%define _version 3.0.0 +%define _version 3.2.0 Name: nemo-extensions -Version: 3.0.0 +Version: 3.2.0 Release: 0 Summary: Set of extensions for Nemo, the Cinnamon file manager License: GPL-2.0 and 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 -# 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-seahorse_no-nautilus-conflicts.patch sor.alexei@meowr.ru -- Strip conflicted with nautilus-extension-seahorse files. -Patch2: nemo-seahorse_no-nautilus-conflicts.patch +Patch0: nemo-seahorse_no-nautilus-conflicts.patch # PATCH-FIX-OPENSUSE nemo-dropbox_no-dropbox-bin.patch sor.alexei@meowr.ru -- Strip dropbox binary installation. -Patch3: nemo-dropbox_no-dropbox-bin.patch +Patch1: nemo-dropbox_no-dropbox-bin.patch # PATCH-FIX-OPENSUSE nemo-gtkhash_mbedtls-2.x.patch sor.alexei@meowr.ru -- Add mbed TLS 2.x+ support. -Patch4: nemo-gtkhash_mbedtls-2.x.patch +Patch2: nemo-gtkhash_mbedtls-2.x.patch BuildRequires: docutils BuildRequires: gettext-runtime BuildRequires: gnome-common @@ -54,7 +50,7 @@ BuildRequires: python-gtk-devel BuildRequires: python-setuptools BuildRequires: update-desktop-files BuildRequires: pkgconfig(cjs-1.0) -BuildRequires: pkgconfig(clutter-gst-2.0) +BuildRequires: pkgconfig(clutter-gst-3.0) BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(dbus-glib-1) @@ -70,7 +66,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(nettle) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pygobject-3.0) -BuildRequires: pkgconfig(webkitgtk-3.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) BuildRequires: mbedtls-devel %endif @@ -356,8 +352,6 @@ directory in Nemo. %patch0 %patch1 %patch2 -%patch3 -%patch4 # Remove spurious executable permission. chmod a-x nemo-audio-tab/COPYING.GPL3 nemo-emblems/COPYING.GPL3 @@ -595,7 +589,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/nemo-pastebin.py %{_bindir}/nemo-pastebin-configurator.py %{_datadir}/nemo-pastebin/ -%{python_sitelib}/nemo_pastebin-1.0.0-* +%{python_sitelib}/nemo_pastebin-* %{_datadir}/applications/nemo-pastebin-configurator.desktop %{_datadir}/pixmaps/nemo-pastebin.* %{_datadir}/glib-2.0/schemas/nemo-pastebin.gschema.xml diff --git a/nemo-seahorse_gpg-2.1.patch b/nemo-seahorse_gpg-2.1.patch deleted file mode 100644 index 524ac7f..0000000 --- a/nemo-seahorse_gpg-2.1.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- nemo-seahorse.orig/configure.ac -+++ nemo-seahorse/configure.ac -@@ -59,3 +59,3 @@ - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.1" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) diff --git a/nemo-terminal_vte-2.91.patch b/nemo-terminal_vte-2.91.patch deleted file mode 100644 index 5f2f837..0000000 --- a/nemo-terminal_vte-2.91.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 -@@ -124,7 +126,7 @@ class NemoTerminal(object): - self.term.connect("drag_data_received", self._on_drag_data_received) - - # Container -- self.vscrollbar = Gtk.VScrollbar.new(self.term.adjustment) -+ self.vscrollbar = Gtk.VScrollbar.new(self.term.get_vadjustment()) - - self.hbox = Gtk.HBox() - self.hbox.pack_start(self.term, True, True, 0) From 5d640a12d5c0fc05e67f330358056c8d45da73086dae5651daa224be430b2f4e Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 11 Nov 2016 20:23:35 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=31 --- nemo-extensions.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nemo-extensions.spec b/nemo-extensions.spec index ea2d309..8844746 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -17,6 +17,8 @@ # Do not package nemo-extension-media-columns for now: slows Nemo down. +# nemo-extension-terminal 'requires' two versions, confusing typelib finder. +%define __requires_exclude typelib\\((Vte))\ = %define _version 3.2.0 Name: nemo-extensions Version: 3.2.0