diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 --- a/.cvsignore +++ /dev/null diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a8912e8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +terminator_0.94.tar.gz +/terminator_0.95.tar.gz +/terminator_0.96.tar.gz +/terminator-0.97.tar.gz +/terminator-0.98.tar.gz +/terminator-1.90.tar.gz +/Terminator-1.91.tar.gz +/terminator-1.91.tar.gz diff --git a/0000-terminator-fix-desktop-file.patch b/0000-terminator-fix-desktop-file.patch new file mode 100644 index 0000000..712f829 --- /dev/null +++ b/0000-terminator-fix-desktop-file.patch @@ -0,0 +1,11 @@ +--- data/terminator.desktop.in.orig 2017-02-27 10:19:04.779904158 +0100 ++++ data/terminator.desktop.in 2017-02-27 10:19:19.924000420 +0100 +@@ -10,7 +10,7 @@ + X-Ubuntu-Gettext-Domain=terminator + X-Ayatana-Desktop-Shortcuts=NewWindow; + Keywords=terminal;shell;prompt;command;commandline; +-[NewWindow Shortcut Group] ++[X-NewWindow Shortcut Group] + Name=Open a New Window + Exec=terminator + TargetEnvironment=Unity diff --git a/0001-terminator-fix-RHBZ#1268289.patch b/0001-terminator-fix-RHBZ#1268289.patch new file mode 100644 index 0000000..7abae79 --- /dev/null +++ b/0001-terminator-fix-RHBZ#1268289.patch @@ -0,0 +1,127 @@ +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 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 diff --git a/0001-terminator-fix-inactive-colour.patch b/0001-terminator-fix-inactive-colour.patch new file mode 100644 index 0000000..9e35d7d --- /dev/null +++ b/0001-terminator-fix-inactive-colour.patch @@ -0,0 +1,35 @@ +=== modified file 'terminatorlib/prefseditor.py' +--- terminatorlib/prefseditor.py 2013-02-16 00:10:45 +0000 ++++ terminatorlib/prefseditor.py 2013-05-11 22:03:46 +0000 +@@ -923,6 +923,8 @@ + + def on_inactive_color_offset_change_value(self, widget, scroll, value): + """Inactive color offset setting changed""" ++ if value > 1.0: ++ value = 1.0 + self.config['inactive_color_offset'] = round(value, 2) + self.config.save() + + +=== modified file 'terminatorlib/terminal.py' +--- terminatorlib/terminal.py 2013-02-15 15:10:55 +0000 ++++ terminatorlib/terminal.py 2013-05-11 22:03:46 +0000 +@@ -621,11 +621,17 @@ + + factor = self.config['inactive_color_offset'] + self.fgcolor_inactive = self.fgcolor_active.copy() ++ dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"), ++ getattr(self.fgcolor_inactive, "green"), ++ getattr(self.fgcolor_inactive, "blue"))) + + for bit in ['red', 'green', 'blue']: + setattr(self.fgcolor_inactive, bit, + getattr(self.fgcolor_inactive, bit) * factor) + ++ dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"), ++ getattr(self.fgcolor_inactive, "green"), ++ getattr(self.fgcolor_inactive, "blue"))) + colors = self.config['palette'].split(':') + self.palette_active = [] + self.palette_inactive = [] + diff --git a/Makefile b/Makefile deleted file mode 100644 index efb2203..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: terminator -# $Id$ -NAME := terminator -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index e69de29..cfbd447 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (terminator-1.91.tar.gz) = 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d diff --git a/terminator.spec b/terminator.spec new file mode 100644 index 0000000..881c41c --- /dev/null +++ b/terminator.spec @@ -0,0 +1,245 @@ +Name: terminator +Version: 1.91 +Release: 10%{?dist} +Summary: Store and run multiple GNOME terminals in one window + +License: GPLv2 +URL: http://gnometerminator.blogspot.com/p/introduction.html +Source0: https://launchpad.net/terminator/gtk3/%{version}/+download/terminator-%{version}.tar.gz + +BuildArch: noarch +BuildRequires: python2-devel gettext desktop-file-utils intltool +Requires: vte291 python2-gobject keybinder3 desktop-file-utils + +%if 0%{?rhel} +Requires: python-psutil +%else +Requires: python2-psutil +%endif + +Patch0: 0000-terminator-fix-desktop-file.patch + + +%description +Multiple GNOME terminals in one window. This is a project to produce +an efficient way of filling a large area of screen space with +terminals. This is done by splitting the window into a resizeable +grid of terminals. As such, you can produce a very flexible +arrangements of terminals for different tasks. + + +%prep +%setup -q -n terminator-%{version} + +sed -i '/#! \?\/usr.*/d' terminatorlib/*.py +%patch0 -p0 + + +%build +%{__python2} setup.py build + + +%install +rm -rf %{buildroot} +%{__python2} 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 README COPYING ChangeLog +#%{_datadir}/doc/%{name}/* +%{_mandir}/man1/%{name}.* +%{_mandir}/man5/%{name}_config.* +%{_bindir}/%{name}* +%{_bindir}/remotinator +%{python2_sitelib}/* +%{_datadir}/%{name}/terminatorlib/themes/*/gtk-3.0/apps/*.css +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/HighContrast/*/*/%{name}*.png +%{_datadir}/icons/HighContrast/*/*/%{name}*.svg +%{_datadir}/icons/HighContrast/16x16/status/terminal-bell.png +%{_datadir}/icons/hicolor/*/*/%{name}*.png +%{_datadir}/icons/hicolor/*/*/%{name}*.svg +%{_datadir}/icons/hicolor/16x16/status/terminal-bell.png +%{_datadir}/pixmaps/%{name}.png + +%changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.91-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.91-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 24 2018 Miro Hrončok - 1.91-8 +- Update Python macros to new packaging standards + (See https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package) + +* Sat Jul 21 2018 Dominic Hopf - 1.91-7 +- RHBZ#1606509: Fix FTBFS issue, explicitly use python2 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.91-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 21 2018 Iryna Shcherbina - 1.91-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 1.91-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Feb 27 2017 Dominic Hopf - 1.91-1 +- New Upstream Release: Terminator 1.91 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.90-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 30 2016 Matt Rose - 1.90-4 +- add keybinder3 to requires + +* Tue Nov 29 2016 Matt Rose - 1.90-3 +- adjust requires for vte + +* Thu Nov 24 2016 Dominic Hopf - 1.90-2 +- Adjust requires for python(2)-psutil for EPEL + +* Wed Nov 23 2016 Dominic Hopf - 1.90-1 +- New Upstream Release: Terminator 1.90 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.98-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Feb 05 2016 Fedora Release Engineering - 0.98-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Oct 10 2015 Marco Driusso - 0.98-2 +- apply patch from upstream for fixing RHBZ#1268289 and add dependency to + python-psutils + +* Tue Sep 08 2015 Dominic Hopf - 0.98-1 +- New Upstream Release: Terminator 0.98 + +* Thu Jun 25 2015 Dominic Hopf - 0.97-8 +- add dependency to python-keybinder (RHBZ#1234627) + +* Fri Jun 19 2015 Fedora Release Engineering - 0.97-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.97-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Jan 05 2014 Dominic Hopf - 0.97-5 +- fix the new URL for the website + +* Sun Jan 05 2014 Dominic Hopf - 0.97-4 +- update upstream URL to new website (RHBZ#1048553) +- fix bogus date in changelog-warnings + +* Sun Aug 04 2013 Fedora Release Engineering - 0.97-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 28 2013 Dominic Hopf - 0.97-2 +- fix an issue when inactive colour is set to 1.0 (RHBZ#968379) + +* Fri May 17 2013 Dominic Hopf - 0.97-1 +- New upstream release: Terminator 0.97 + +* Fri Feb 15 2013 Fedora Release Engineering - 0.96-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 0.96-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.96-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Sep 24 2011 Dominic Hopf - 0.96-1 +- New upstream release: Terminator 0.96 + +* Wed Feb 09 2011 Fedora Release Engineering - 0.95-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 01 2010 Dominic Hopf - 0.95-2 +- readd dependency for gnome-python2-bonobo + +* Wed Aug 25 2010 Dominic Hopf - 0.95-1 +- New upstream release: Terminator 0.95 + +* Thu Jul 22 2010 David Malcolm - 0.94-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Jul 19 2010 Dominic Hopf - 0.94-1 +- New upstream release: Terminator 0.94 + +* Thu Apr 15 2010 Dominic Hopf - 0.93-1 +- New upstream release: Terminator 0.93 + +* Fri Apr 09 2010 Dominic Hopf - 0.92-1 +- New upstream release: Terminator 0.92 + +* Mon Apr 05 2010 Dominic Hopf - 0.91-1 +- New upstream release: Terminator 0.91 + +* Wed Mar 10 2010 Steven Fernandez 0.14-3 +- Added patch to fix the traceback reported in bug 567861 + +* Wed Mar 3 2010 Steven Fernandez - 0.14-2 +- Added dependency for deskbar-applets and gnome-python2-{bonobo,canvas} + packages (bug 540551 and bug 509461) + +* Thu Jan 14 2010 Dominic Hopf - 0.14-1 +- New terminator version 0.14 + +* Sun Jul 26 2009 Fedora Release Engineering - 0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 7 2009 Ian Weller - 0.13-2 +- BuildRequires: intltool + +* Thu Jul 2 2009 Ian Weller - 0.13-1 +- New upstream release + +* Wed Feb 25 2009 Fedora Release Engineering - 0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 20 2009 Ian Weller 0.12-1 +- New upstream release +- Upstream fixed desktop file, removing patch0 + +* Mon Dec 08 2008 Ian Weller 0.11-3 +- Patch version in terminatorlib/verison.py to the one we think it is +- Fix License tag +- Update post and postun scripts with one line + +* Mon Dec 01 2008 Ian Weller 0.11-2 +- Add BuildRequires: gettext +- Fix installation of .desktop file +- terminator-0.11-desktop.patch: + Remove useless things + Move to same category as gnome-terminal +- Uses spaces instead of tabs in the specfile because I can't stand tabs + +* Mon Dec 01 2008 Ian Weller 0.11-1 +- Update upstream +- Fix description to something useful +- Fix group +- Fix some specfile oddities +- Complete/restandardize file list +- Get rid of she-bangs in python_sitelib + +* Sat Sep 13 2008 Max Spevack 0.10 +- New upstream release. +- Tried to make sure the spec file matches guidelines on Fedora wiki. + +* Tue Jul 08 2008 chantra AatT rpm-based DdOoTt org 0.9.fc9.rb +- New upstream release + +* Sat May 17 2008 chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb +- Initial release for Fedora 9.