Hello community, here is the log from the commit of package terminator for openSUSE:Factory checked in at 2016-02-25 22:09:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terminator (Old) and /work/SRC/openSUSE:Factory/.terminator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terminator" Changes: -------- --- /work/SRC/openSUSE:Factory/terminator/terminator.changes 2014-11-18 22:45:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.terminator.new/terminator.changes 2016-02-26 00:45:59.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 20 12:01:51 UTC 2016 - [email protected] + +- Version update to 0.78: + * Run the macro scriptlets for icons/desktop files + * Adjust filelist for the current state + * Fix few tiny rpmlint warnings +- Add patch: + * 0001-terminator-fix-RHBZ#1268289.patch + +------------------------------------------------------------------- Old: ---- terminator-0.97.tar.bz2 New: ---- 0001-terminator-fix-RHBZ#1268289.patch terminator-0.98.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terminator.spec ++++++ --- /var/tmp/diff_new_pack.dv7905/_old 2016-02-26 00:46:01.000000000 +0100 +++ /var/tmp/diff_new_pack.dv7905/_new 2016-02-26 00:46:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package terminator # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,24 @@ # +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%else +Requires: python-vte +Requires: vte +BuildArch: noarch +%endif Name: terminator -Version: 0.97 +Version: 0.98 Release: 0 Summary: Store and run multiple GNOME terminals in one window License: GPL-2.0 Group: System/X11/Terminals Url: http://www.tenshu.net/terminator -Source0: terminator-%{version}.tar.bz2 +Source0: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz Patch0: terminator-desktop.patch +# PATCH-FIX-UPSTREAM: taken from fedora to fix ibus interactions +Patch1: 0001-terminator-fix-RHBZ#1268289.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gettext @@ -33,18 +42,12 @@ BuildRequires: python-devel BuildRequires: update-desktop-files Requires: python-gnome -%if 0%{?suse_version} > 1130 -Requires: python-vte -Requires: vte -%endif +Requires: python-psutil +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme Recommends: %{name}-lang Recommends: python-keybinder BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%else -BuildArch: noarch -%endif %description Multiple GNOME terminals in one window. This is a project to produce @@ -54,46 +57,76 @@ arrangements of terminals for different tasks. %lang_package + %prep %setup -q %patch0 -#translation-update-upstream +%patch1 -p1 %build python setup.py build -#remove unsupported translations -for trans in ms jv af ur ka oc si fy tyv; do - rm -R ./build/mo/${trans} -done %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} + rm -f %{buildroot}/%{_datadir}/icons/hicolor/icon-theme.cache rm -f %{buildroot}/%{_datadir}/applications/%{name}.desktop +rm -rf %{buildroot}%{_datadir}/doc/terminator/apidoc/.buildinfo +rm -rf %{buildroot}%{_datadir}/doc/terminator/html/.buildinfo + desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications data/%{name}.desktop %suse_update_desktop_file %{name} + %fdupes %{buildroot} %find_lang %{name} +%if 0%{?suse_version} >= 1140 %post -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : +%icon_theme_cache_post +%desktop_database_post %postun -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || : +%icon_theme_cache_postun +%desktop_database_postun +%endif %files %defattr(-,root,root) %doc ChangeLog COPYING README -%{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/%{name}.1* -%{_mandir}/man5/%{name}_config.5* -%{_bindir}/terminator +%dir %{_datadir}/doc/terminator +%dir %{_datadir}/icons/HighContrast +%dir %{_datadir}/icons/HighContrast/16x16 +%dir %{_datadir}/icons/HighContrast/16x16/actions +%dir %{_datadir}/icons/HighContrast/16x16/apps +%dir %{_datadir}/icons/HighContrast/16x16/status +%dir %{_datadir}/icons/HighContrast/22x22 +%dir %{_datadir}/icons/HighContrast/22x22/apps +%dir %{_datadir}/icons/HighContrast/24x24 +%dir %{_datadir}/icons/HighContrast/24x24/apps +%dir %{_datadir}/icons/HighContrast/32x32 +%dir %{_datadir}/icons/HighContrast/32x32/apps +%dir %{_datadir}/icons/HighContrast/48x48 +%dir %{_datadir}/icons/HighContrast/48x48/apps +%dir %{_datadir}/icons/HighContrast/scalable +%dir %{_datadir}/icons/HighContrast/scalable/apps +%{_datadir}/doc/%{name}/* +%{_mandir}/man1/%{name}.* +%{_mandir}/man5/%{name}_config.* +%{_bindir}/%{name}* %{_bindir}/remotinator - -%{_datadir}/icons/hicolor/*/*/termina* -%{_datadir}/pixmaps/terminator.png %{python_sitelib}/* +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/*/%{name}*.png +%{_datadir}/icons/hicolor/*/*/%{name}*.svg +%{_datadir}/icons/HighContrast/*/*/%{name}*.png +%{_datadir}/icons/HighContrast/*/*/%{name}*.svg +%{_datadir}/icons/hicolor/16x16/status/terminal-bell.png +%{_datadir}/icons/HighContrast/16x16/status/terminal-bell.png +%{_datadir}/pixmaps/%{name}.png %files lang -f %{name}.lang +%defattr(-,root,root) %changelog ++++++ 0001-terminator-fix-RHBZ#1268289.patch ++++++ diff -Naur a/ChangeLog b/ChangeLog --- a/ChangeLog 2015-09-08 17:27:00.000000000 +0200 +++ b/ChangeLog 2015-10-10 11:55:37.000000000 +0200 @@ -1,3 +1,11 @@ +terminator trunk: + * Features + * Enhancements + * Bug fixes + * Fix for those not running IBus, where the IBus workaround caused + broken keys in other keymaps set with non-IBus tools (Steve + Boddy, LP#1494606) + terminator 0.98: * Features * Layout launcher with option or shortcut (Steve Boddy) diff -Naur a/debian/changelog b/debian/changelog --- a/debian/changelog 2015-09-08 17:27:00.000000000 +0200 +++ b/debian/changelog 2015-10-10 11:55:37.000000000 +0200 @@ -1,3 +1,9 @@ +terminator (0.98) trusty; urgency=low + + * New upstream release of 0.98 + + -- Stephen Boddy <[email protected]> Wed, 26 Aug 2015 20:28:10 +0200 + terminator (0.97~ppa3) saucy; urgency=low * No-change upload for saucy diff -Naur a/debian/control b/debian/control --- a/debian/control 2015-09-08 17:27:00.000000000 +0200 +++ b/debian/control 2015-10-10 11:55:37.000000000 +0200 @@ -14,7 +14,7 @@ Package: terminator Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-vte, python-gobject, python-gtk2 (>= 2.14.0), gconf2, libgtk2.0-bin, hicolor-icon-theme +Depends: ${python:Depends}, ${misc:Depends}, python-vte, python-gobject, python-gtk2 (>= 2.14.0), python-psutil, gconf2, libgtk2.0-bin, hicolor-icon-theme XB-Python-Version: ${python:Versions} Provides: x-terminal-emulator Recommends: xdg-utils, python-gnome2, python-keybinder diff -Naur a/remotinator b/remotinator --- a/remotinator 2015-09-08 17:27:00.000000000 +0200 +++ b/remotinator 2015-10-10 11:55:37.000000000 +0200 @@ -29,7 +29,7 @@ sys.exit(1) APP_NAME='remotinator' -APP_VERSION='0.97' +APP_VERSION='0.98' COMMANDS={ 'hsplit': ['terminal_hsplit', 'Split the current terminal horizontally'], diff -Naur a/terminator b/terminator --- a/terminator 2015-09-08 17:27:00.000000000 +0200 +++ b/terminator 2015-10-10 11:55:37.000000000 +0200 @@ -20,6 +20,8 @@ import sys import os +import psutil +import pwd try: ORIGCWD = os.getcwd() except OSError: @@ -57,7 +59,11 @@ # Workaround for IBus intefering with broadcast when using dead keys # Environment also needs IBUS_DISABLE_SNOOPER=1, or double chars appear # in the receivers. - os.environ['IBUS_DISABLE_SNOOPER']='1' + username = pwd.getpwuid(os.getuid()).pw_name + ibus_running = [p for p in psutil.process_iter() if p.name == 'ibus-daemon' and p.username == username] + ibus_running = len(ibus_running) > 0 + if ibus_running: + os.environ['IBUS_DISABLE_SNOOPER']='1' dbus_service = None @@ -69,7 +75,6 @@ # launch gui, return selection LAYOUTLAUNCHER=LayoutLauncher() else: - # Attempt to import our dbus server. If one exists already we will just # connect to that and ask for a new window. If not, we will create one and # continue. Failure to import dbus, or the global config option "dbus" @@ -112,6 +117,7 @@ TERMINATOR.set_origcwd(ORIGCWD) TERMINATOR.set_dbus_data(dbus_service) TERMINATOR.reconfigure() + TERMINATOR.ibus_running = ibus_running try: dbg('Creating a terminal with layout: %s' % OPTIONS.layout) diff -Naur a/terminatorlib/terminal.py b/terminatorlib/terminal.py --- a/terminatorlib/terminal.py 2015-09-08 17:27:00.000000000 +0200 +++ b/terminatorlib/terminal.py 2015-10-10 11:55:37.000000000 +0200 @@ -844,13 +844,14 @@ dbg('Terminal::on_keypress: Called on %s with no event' % widget) return(False) - # Workaround for IBus intefering with broadcast when using dead keys + # Workaround for IBus interfering with broadcast when using dead keys # Environment also needs IBUS_DISABLE_SNOOPER=1, or double chars appear # in the receivers. - if (event.state | gtk.gdk.MODIFIER_MASK ) ^ gtk.gdk.MODIFIER_MASK != 0: - dbg('Terminal::on_keypress: Ingore processed event with event.state %d' % event.state) - return(False) - + if self.terminator.ibus_running: + if (event.state | gtk.gdk.MODIFIER_MASK ) ^ gtk.gdk.MODIFIER_MASK != 0: + dbg('Terminal::on_keypress: Ignore processed event with event.state %d' % event.state) + return(False) + # FIXME: Does keybindings really want to live in Terminator()? mapping = self.terminator.keybindings.lookup(event) diff -Naur a/terminatorlib/terminator.py b/terminatorlib/terminator.py --- a/terminatorlib/terminator.py 2015-09-08 17:27:00.000000000 +0200 +++ b/terminatorlib/terminator.py 2015-10-10 11:55:37.000000000 +0200 @@ -32,6 +32,7 @@ pid_cwd = None gnome_client = None debug_address = None + ibus_running = None doing_layout = None layoutname = None
