diff --git a/.gitignore b/.gitignore index 2e1c115..bd6bce4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ terminator_0.94.tar.gz /Terminator-1.91.tar.gz /terminator-1.91.tar.gz /terminator-1.92.tar.gz +/terminator-2.0.tar.gz +/terminator-2.0.1.tar.gz diff --git a/0001-Disable-special-logic-for-pasting-on-Wayland.patch b/0001-Disable-special-logic-for-pasting-on-Wayland.patch deleted file mode 100644 index 6f4226a..0000000 --- a/0001-Disable-special-logic-for-pasting-on-Wayland.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fb6b940f482ad8ebd22ad8f7529ac3bf8446ac18 Mon Sep 17 00:00:00 2001 -From: Ryan Fonnesbeck -Date: Fri, 1 May 2020 17:05:40 +0200 -Subject: [PATCH] Disable special logic for pasting on Wayland - ---- - terminatorlib/terminal.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py -index 2f22dfb9..6a2a445b 100644 ---- a/terminatorlib/terminal.py -+++ b/terminatorlib/terminal.py -@@ -927,12 +927,11 @@ class Terminal(Gtk.VBox): - # Suppress double-click behavior - return True - -- use_primary = (display_manager() != 'WAYLAND') - if self.config['putty_paste_style']: - middle_click = [self.popup_menu, (widget, event)] -- right_click = [self.paste_clipboard, (use_primary, )] -+ right_click = [self.paste_clipboard, (True, )] - else: -- middle_click = [self.paste_clipboard, (use_primary, )] -+ middle_click = [self.paste_clipboard, (True, )] - right_click = [self.popup_menu, (widget, event)] - - if event.button == self.MOUSEBUTTON_LEFT: --- -2.26.2 - diff --git a/0002-wide_handle.patch b/0002-wide_handle.patch deleted file mode 100644 index 810bcc1..0000000 --- a/0002-wide_handle.patch +++ /dev/null @@ -1,22 +0,0 @@ -From da9b5d49c1c9031de0e887e093c84fb773863d7f Mon Sep 17 00:00:00 2001 -From: Matt Rose -Date: Mon, 24 Aug 2020 14:41:21 -0400 -Subject: [PATCH] Add 'wide_handle' property to allow you to paste from the - first column to the right of a vertically split window - ---- - terminatorlib/paned.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/terminatorlib/paned.py b/terminatorlib/paned.py -index bb36f04c..933461f7 100644 ---- a/terminatorlib/paned.py -+++ b/terminatorlib/paned.py -@@ -507,6 +507,7 @@ def __init__(self): - """Class initialiser""" - Paned.__init__(self) - GObject.GObject.__init__(self) -+ self.props.wide_handle = True - self.register_signals(HPaned) - self.cnxids.new(self, 'button-press-event', self.on_button_press) - self.cnxids.new(self, 'button-release-event', self.on_button_release) diff --git a/sources b/sources index c3feb0a..658aeb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (terminator-1.92.tar.gz) = b5b3f5f5beb08c110b8000238891d4fab65b16615bf3f951d410c083be82ef9c0745b705bd0dd9fb2eb6e20f6ec12c01e447a994bb95bf6aee4dd049f826b596 +SHA512 (terminator-2.0.1.tar.gz) = bc8094944952bec96b6dc92ca25453fe19076daa23f0b672edc664e9ecdf83a58c5a2a161a26c1a44280a01601827cb728766ec9d20bc3d303072ae040ea2352 diff --git a/terminator.spec b/terminator.spec index c97a2d6..7729594 100644 --- a/terminator.spec +++ b/terminator.spec @@ -1,19 +1,19 @@ Name: terminator -Version: 1.92 -Release: 6%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Store and run multiple GNOME terminals in one window License: GPLv2 URL: https://github.com/gnome-terminator -Source0: https://github.com/gnome-terminator/terminator/releases/download/v1.92/terminator-1.92.tar.gz +Source0: https://github.com/gnome-terminator/terminator/releases/download/v%{version}/terminator-%{version}.tar.gz BuildArch: noarch BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: gtk-update-icon-cache -BuildRequires: intltool -BuildRequires: python3-devel +BuildRequires: python3-babel +BuildRequires: python3-devel +BuildRequires: python3-pytest-runner Requires: keybinder3 Requires: python3-configobj @@ -22,8 +22,7 @@ Requires: python3-psutil Requires: vte291 Patch0: 0000-terminator-fix-desktop-file.patch -Patch1: 0001-Disable-special-logic-for-pasting-on-Wayland.patch -Patch2: 0002-wide_handle.patch + %description Multiple GNOME terminals in one window. This is a project to produce @@ -43,21 +42,18 @@ arrangements of terminals for different tasks. %install %{__python3} setup.py install -O1 --skip-build --root %{buildroot} -%find_lang %{name} rm -f %{buildroot}/%{_datadir}/icons/hicolor/icon-theme.cache rm -f %{buildroot}/%{_datadir}/applications/%{name}.desktop desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications data/%{name}.desktop -%files -f %{name}.lang -%doc COPYING +%files %{_mandir}/man1/%{name}.* %{_mandir}/man5/%{name}_config.* %{_bindir}/%{name}* %{_bindir}/remotinator %{python3_sitelib}/* -%{_datadir}/%{name}/terminatorlib/themes/*/gtk-3.0/apps/*.css -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.metainfo.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/HighContrast/*/*/%{name}*.png %{_datadir}/icons/HighContrast/*/*/%{name}*.svg @@ -67,7 +63,11 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications data/%{name %{_datadir}/icons/hicolor/16x16/status/terminal-bell.png %{_datadir}/pixmaps/%{name}.png + %changelog +* Sun Oct 11 2020 Dominic Hopf - 2.0.1-1 +- New upstream release: 2.0.1 + * Tue Aug 25 2020 Hans de Goede - 1.92-6 - Fix not being able to select text in the first column of a split terminal https://github.com/gnome-terminator/terminator/issues/191