Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rdesktop for openSUSE:Factory checked in at 2021-02-01 13:29:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdesktop (Old) and /work/SRC/openSUSE:Factory/.rdesktop.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rdesktop" Mon Feb 1 13:29:08 2021 rev:44 rq:868305 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rdesktop/rdesktop.changes 2019-12-31 10:28:23.070950651 +0100 +++ /work/SRC/openSUSE:Factory/.rdesktop.new.28504/rdesktop.changes 2021-02-01 13:31:00.102349682 +0100 @@ -1,0 +2,7 @@ +Wed Jan 27 10:30:05 UTC 2021 - seife+...@b1-systems.com + +- remove dependency on python2 + * add rdesktop-convert-map.python3.patch, remove obsolete + rdesktop-Fix-keymap-script.patch + +------------------------------------------------------------------- Old: ---- rdesktop-Fix-keymap-script.patch New: ---- rdesktop-convert-map.python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdesktop.spec ++++++ --- /var/tmp/diff_new_pack.OgnwPk/_old 2021-02-01 13:31:00.750350481 +0100 +++ /var/tmp/diff_new_pack.OgnwPk/_new 2021-02-01 13:31:00.754350486 +0100 @@ -1,7 +1,7 @@ # # spec file for package rdesktop # -# Copyright (c) 2019 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 @@ -26,8 +26,8 @@ Source: https://github.com/rdesktop/rdesktop/releases/download/v%{version}/%{name}-%{version}.tar.gz ## FIX-openSUSE: remove "Don't depend on pkg-config" Patch0: rdesktop-fix_pkgconfig_check.patch -# PATCH-FIX-OPENSUSE rdesktop-Fix-keymap-script.patch -Patch3: rdesktop-Fix-keymap-script.patch +# PATCH-FIX-OPENSUSE rdesktop-convert-map.python3.patch -- seife+...@b1-systems.com +Patch3: rdesktop-convert-map.python3.patch # PATCH-FIX-UPSTREAM rdesktop-fix_segfault_in_rdssl_rkey_get_exp_mod.patch Patch4: rdesktop-fix_segfault_in_rdssl_rkey_get_exp_mod.patch BuildRequires: alsa-devel @@ -57,7 +57,7 @@ %prep %setup -q %patch0 -%patch3 +%patch3 -p1 %patch4 -p1 ## rpmlint ++++++ rdesktop-convert-map.python3.patch ++++++ Index: b/keymaps/convert-map =================================================================== --- a/keymaps/convert-map +++ b/keymaps/convert-map @@ -1,4 +1,5 @@ -#!/usr/bin/env python2 +#!/usr/bin/python3 +# -*- coding: utf-8 -*- # -*-Python-*- # # Copyright 2001 Peter ??strand <astr...@cendio.se> for Cendio AB @@ -25,13 +26,13 @@ def main(): if not line: break if line.startswith("#") or line.startswith("include"): - print line, + print(line, end=' ') continue fields = line.split() if line.startswith("map"): - print "map 0x%s" % fields[1] + print("map 0x%s" % fields[1]) continue scancode = fields[0] @@ -47,16 +48,16 @@ def main(): elif pos == 4: modifiers = "shift altgr" else: - raise("Invalid line: %s" % line) + raise "Invalid line: %s" - print "%s 0x%s %s" % (keysym, scancode, modifiers) + print("%s 0x%s %s" % (keysym, scancode, modifiers)) if __name__ == "__main__": if len(sys.argv) < 2: - print "Convert old-style keymaps to new style" - print "Usage: %s <old-style-keymap>" % sys.argv[0] + print("Convert old-style keymaps to new style") + print("Usage: %s <old-style-keymap>" % sys.argv[0]) sys.exit(1) else: main()
