diff --git a/terminator-0.14-catch_multiple_exceptions.patch b/terminator-0.14-catch_multiple_exceptions.patch new file mode 100644 index 0000000..ed2944a --- /dev/null +++ b/terminator-0.14-catch_multiple_exceptions.patch @@ -0,0 +1,12 @@ +diff -up terminator-0.14/terminatorlib/terminator.py.orig terminator-0.14/terminatorlib/terminator.py +--- terminator-0.14/terminatorlib/terminator.py.orig 2010-03-10 11:21:25.000000000 +0530 ++++ terminator-0.14/terminatorlib/terminator.py 2010-03-10 11:23:22.164499238 +0530 +@@ -1032,7 +1032,7 @@ class Terminator: + if matcher (current_geo, possible_geo, best_geo): + best_index = i + best_geo = possible_geo +- except TypeError, KeyError: ++ except (TypeError, KeyError): + # Not being called on a Paned widget + pass + #if best_index is None: diff --git a/terminator.spec b/terminator.spec index ba20e59..8b396e2 100644 --- a/terminator.spec +++ b/terminator.spec @@ -2,7 +2,7 @@ Name: terminator Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store and run multiple GNOME terminals in one window Group: User Interface/Desktops @@ -15,6 +15,9 @@ BuildArch: noarch BuildRequires: python-devel gettext desktop-file-utils intltool Requires: vte gnome-python2-gconf GConf2 gtk2 desktop-file-utils Requires: deskbar-applet gnome-python2-bonobo gnome-python2-canvas +# This patch is temporary till we move to the current upstream release which is +# a complete rewrite (and makes this patch unnecessary as such). +Patch0: terminator-0.14-catch_multiple_exceptions.patch %description Multiple GNOME terminals in one window. This is a project to produce @@ -26,6 +29,7 @@ arrangements of terminals for different tasks. %prep %setup -qn %{name}-%{version} +%patch0 -p1 -b .catch_multiple_exceptions sed -i '/#! \?\/usr.*/d' terminatorlib/*.py @@ -68,6 +72,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* 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)