Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package caja-terminal for openSUSE:Factory checked in at 2021-08-12 10:03:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caja-terminal (Old) and /work/SRC/openSUSE:Factory/.caja-terminal.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja-terminal" Thu Aug 12 10:03:29 2021 rev:3 rq:911536 version:0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/caja-terminal/caja-terminal.changes 2020-03-03 10:18:36.074943448 +0100 +++ /work/SRC/openSUSE:Factory/.caja-terminal.new.1899/caja-terminal.changes 2021-08-12 10:03:29.252821687 +0200 @@ -1,0 +2,6 @@ +Thu Aug 12 01:26:34 UTC 2021 - Steve Kowalik <steven.kowa...@suse.com> + +- Add python3-support.patch: + * Use correct imports for Python 3, and change shebang. + +------------------------------------------------------------------- New: ---- python3-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caja-terminal.spec ++++++ --- /var/tmp/diff_new_pack.GVCUoE/_old 2021-08-12 10:03:29.748820988 +0200 +++ /var/tmp/diff_new_pack.GVCUoE/_new 2021-08-12 10:03:29.752820983 +0200 @@ -1,7 +1,7 @@ # # spec file for package caja-terminal # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ License: GPL-3.0-or-later URL: https://github.com/yselkowitz/caja-terminal Source: https://github.com/yselkowitz/caja-terminal/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: python3-support.patch BuildRequires: gettext BuildRequires: gobject-introspection-devel BuildRequires: python3 @@ -55,6 +56,7 @@ %prep %setup -q +%autopatch -p1 %build # Nothing to build. ++++++ python3-support.patch ++++++ Index: caja-terminal-0.10/code/caja-terminal.py =================================================================== --- caja-terminal-0.10.orig/code/caja-terminal.py +++ caja-terminal-0.10/code/caja-terminal.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: UTF-8 -*- ######################################################################### @@ -48,11 +48,15 @@ __appname__ = "caja-terminal" import os import signal import re -import urllib import gettext gettext.install(__appname__) from xdg import BaseDirectory +try: + from urllib.request import url2pathname +except ImportError: + from urllib import url2pathname + import gi gi.require_version('Caja', '2.0') from gi.repository import Caja @@ -697,7 +701,7 @@ class CajaTerminal(GObject.GObject, Caja window.nt_termhidden = CONF['general_starthidden'] #If it's not a local folder, directory = $HOME if uri[:7] == "file://": - path = urllib.url2pathname(uri[7:]) + path = url2pathname(uri[7:]) else: path = os.environ.get("HOME") #Disable for desktop folder @@ -958,7 +962,7 @@ class CajaTerminal(GObject.GObject, Caja uri_list = selection.data.strip('\r\n\x00').split() for uri in uri_list: if uri[:7] == "file://": #local file - path = urllib.url2pathname(uri[7:]).replace("'", "'\"'\"'") + path = url2pathname(uri[7:]).replace("'", "'\"'\"'") widget.feed_child(" '%s' " % path) def on_evResize_enter_notify_event(self, widget, event, rwidget):
