From 04b7365cf83719ed22de48c44612c26d1483a6a9 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Wed, 17 May 2023 04:35:15 +0800 Subject: [PATCH 1/2] update to python-simpleline-1.1.3-1.el8 Signed-off-by: anolis-bot --- 0001-Always-close-the-password-dialog.patch | 42 --------------------- download | 2 +- python-simpleline.spec | 38 +++++++------------ 3 files changed, 15 insertions(+), 67 deletions(-) delete mode 100644 0001-Always-close-the-password-dialog.patch diff --git a/0001-Always-close-the-password-dialog.patch b/0001-Always-close-the-password-dialog.patch deleted file mode 100644 index 7ece4d6..0000000 --- a/0001-Always-close-the-password-dialog.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8e0c75a0fbc4fc9496e1fcef0ce21fa8e28facc8 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Mon, 29 Jul 2019 18:28:18 +0200 -Subject: [PATCH] Always close the password dialog - -The password dialog should be closed even if no password is provided. -Otherwise, it is not possible to continue, because the UI is blocked. - -Resolves: rhbz#2121914 ---- - simpleline/render/adv_widgets.py | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/simpleline/render/adv_widgets.py b/simpleline/render/adv_widgets.py -index 781d2c5..58376ab 100644 ---- a/simpleline/render/adv_widgets.py -+++ b/simpleline/render/adv_widgets.py -@@ -87,14 +87,13 @@ class PasswordDialog(UIScreen): - return None - - self._password = handler.value -- if not self._password: -- return None -- else: -- # this may seem innocuous, but it's really a giant hack; we should -- # not be calling close() from prompt(), but the input handling code -- # in the TUI is such that without this very simple workaround, we -- # would be forever pelting users with a prompt to enter their pw -- self.close() -+ -+ # this may seem innocuous, but it's really a giant hack; we should -+ # not be calling close() from prompt(), but the input handling code -+ # in the TUI is such that without this very simple workaround, we -+ # would be forever pelting users with a prompt to enter their pw -+ self.close() -+ return None - - @property - def answer(self): --- -2.37.1 - diff --git a/download b/download index 7aa2f48..8dfc1d3 100644 --- a/download +++ b/download @@ -1 +1 @@ -100c88fcdb9ae29939273002d1aff317 simpleline-1.1.1.tar.gz +2bb73dce94cd687d8e244aefbacedf41 simpleline-1.1.3.tar.gz diff --git a/python-simpleline.spec b/python-simpleline.spec index 4aa07a4..87fa1b3 100644 --- a/python-simpleline.spec +++ b/python-simpleline.spec @@ -1,19 +1,15 @@ -%define anolis_release .0.1 - %global srcname simpleline Name: python-%{srcname} Summary: A Python library for creating text UI Url: https://github.com/rhinstaller/python-%{srcname} -Version: 1.1.1 -Release: 3%{anolis_release}%{?dist} +Version: 1.1.3 +Release: 1%{?dist} # This tarball was created from upstream git: # git clone https://github.com/rhinstaller/python-simpleline # cd python-simpleline && make archive Source0: https://github.com/rhinstaller/python-%{srcname}/archive/%{srcname}-%{version}.tar.gz -Patch0: 0001-Always-close-the-password-dialog.patch - License: GPLv2+ BuildArch: noarch BuildRequires: python3-devel @@ -43,17 +39,8 @@ and tools (e.g. serial console) so that every new line is appended to the bottom of the screen. Printed lines are never rewritten! -%package -n python3-%{srcname}-doc -Summary: Documents for %{name} -Requires: python3-%{srcname} = %{?epoch:%{epoch}:}%{version}-%{release} -BuildArch: noarch - -%description -n python3-%{srcname}-doc -Doc pages for %{name}. - %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 %build %make_build @@ -68,18 +55,21 @@ make test %files -n python3-%{srcname} -f python-%{srcname}.lang %license COPYING -%{python3_sitelib}/* - -%files -n python3-%{srcname}-doc %doc ChangeLog README.md +%{python3_sitelib}/* %changelog -* Fri Dec 23 2022 DengXiewei - 1.1.1-3.0.1 -- Add doc sub package - -* Thu Sep 1 2022 Radek Vykydal - 1.1.1-3 -- Always close the password dialog - Resolves: rhbz#2121914 +* Thu Oct 27 2022 Jiri Konecny - 1.1.3-1 +- Add tests for UIScreen wide disabling of concurrency check (jkonecny) +- Abstract registering signal handler in the InputHandler constructor (jkonecny) +- Allow to disable concurrency check for all UIScreen inputs (jkonecny) +- Enable execution of the tests on GitHub actions (jkonecny) +- Add Makefile target for container tests execution (jkonecny) +- Remove pocketlint from the build requires (jkonecny) + +* Thu Sep 22 2022 Jiri Konecny - 1.1.2-1 +- Always close the password dialog (vponcova) + Resolves: rhbz#2125272 * Tue Aug 11 2020 Jiri Konecny - 1.1.1-2 - Fix file extension of gating.yaml -- Gitee From c93449e8b1a82eceb8b1489d3b5f513b1a2f37a5 Mon Sep 17 00:00:00 2001 From: DengXiewei Date: Wed, 20 Jul 2022 16:24:28 +0800 Subject: [PATCH 2/2] Add doc sub package Signed-off-by: DengXiewei --- python-simpleline.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/python-simpleline.spec b/python-simpleline.spec index 87fa1b3..aed697c 100644 --- a/python-simpleline.spec +++ b/python-simpleline.spec @@ -1,10 +1,12 @@ +%define anolis_release .0.1 + %global srcname simpleline Name: python-%{srcname} Summary: A Python library for creating text UI Url: https://github.com/rhinstaller/python-%{srcname} Version: 1.1.3 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} # This tarball was created from upstream git: # git clone https://github.com/rhinstaller/python-simpleline # cd python-simpleline && make archive @@ -39,6 +41,14 @@ and tools (e.g. serial console) so that every new line is appended to the bottom of the screen. Printed lines are never rewritten! +%package -n python3-%{srcname}-doc +Summary: Documents for %{name} +Requires: python3-%{srcname} = %{?epoch:%{epoch}:}%{version}-%{release} +BuildArch: noarch + +%description -n python3-%{srcname}-doc +Doc pages for %{name}. + %prep %setup -q -n %{srcname}-%{version} @@ -55,10 +65,15 @@ make test %files -n python3-%{srcname} -f python-%{srcname}.lang %license COPYING -%doc ChangeLog README.md %{python3_sitelib}/* +%files -n python3-%{srcname}-doc +%doc ChangeLog README.md + %changelog +* Wed May 31 2023 DengXiewei - 1.1.3-1.0.1 +- Add doc sub package + * Thu Oct 27 2022 Jiri Konecny - 1.1.3-1 - Add tests for UIScreen wide disabling of concurrency check (jkonecny) - Abstract registering signal handler in the InputHandler constructor (jkonecny) -- Gitee