diff --git a/Ensure-that-all-output-reaches-the-client-when-daemo.patch b/Ensure-that-all-output-reaches-the-client-when-daemo.patch deleted file mode 100644 index 1336642..0000000 --- a/Ensure-that-all-output-reaches-the-client-when-daemo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 949c674b807ddfb312cbac234b1b995066c77dad Mon Sep 17 00:00:00 2001 -From: Matt Coleman -Date: Thu, 7 Nov 2019 19:43:57 -0500 -Subject: [PATCH] Ensure that all output reaches the client when daemonized - ---- - configshell/console.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configshell/console.py b/configshell/console.py -index 8ed6b506aea9..003a855080e3 100644 ---- a/configshell/console.py -+++ b/configshell/console.py -@@ -191,7 +191,7 @@ class Console(object): - break - else: - clean_text = text -- self.raw_write(clean_text) -+ self.raw_write(clean_text, output=self._stdout) - - def indent(self, text, margin=2): - ''' --- -2.16.4 - diff --git a/_service b/_service index 69ea206..e3e90af 100644 --- a/_service +++ b/_service @@ -5,10 +5,9 @@ python-configshell-fb @PARENT_TAG@ - v(\d*\.\d*\.)fb(\d*) + v(\d*\.\d*\.)(\d*) \1\2 - v1.1.27 - enable + v1.1.28 *configshell-fb*.tar diff --git a/python-configshell-fb-1.1.28.tar.xz b/python-configshell-fb-1.1.28.tar.xz new file mode 100644 index 0000000..b44ff4f --- /dev/null +++ b/python-configshell-fb-1.1.28.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a534d0e4c890f14e93c4750cd64dd047b5e6d6fce2c202e6845da52a86c447f0 +size 28528 diff --git a/python-configshell-fb-v1.1.27.tar.xz b/python-configshell-fb-v1.1.27.tar.xz deleted file mode 100644 index 5e94517..0000000 --- a/python-configshell-fb-v1.1.27.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b937f283c18ee40ab2c30cdfbdbbdae9391f15cc05ea3f709012dc87a5a392c -size 29804 diff --git a/python-configshell-fb.changes b/python-configshell-fb.changes index 75166e1..2c643ef 100644 --- a/python-configshell-fb.changes +++ b/python-configshell-fb.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jan 30 21:39:26 UTC 2021 - Lee Duncan + +- Update to version v1.1.28 from v1.1.27 (jre#SLE-17360): + * version 1.1.28 + * Ensure that all output reaches the client when daemonized + * Remove Epydoc markup from command messages + * Remove epydoc imports and epydoc calls + Which removed the need for patch: + * Ensure-that-all-output-reaches-the-client-when-daemo.patch + ------------------------------------------------------------------- Tue Mar 03 17:32:48 UTC 2020 - lduncan@suse.com diff --git a/python-configshell-fb.spec b/python-configshell-fb.spec index af77b46..551cd7c 100644 --- a/python-configshell-fb.spec +++ b/python-configshell-fb.spec @@ -1,7 +1,7 @@ # # spec file for package python-configshell-fb # -# 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 @@ -18,17 +18,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-configshell-fb -Version: 1.1.27 +Version: 1.1.28 Release: 0%{?dist} Summary: A Python library for building configuration shells License: Apache-2.0 Group: Development/Libraries/Python URL: https://github.com/open-iscsi/configshell-fb -Source: %{name}-v%{version}.tar.xz -Patch1: Ensure-that-all-output-reaches-the-client-when-daemo.patch +Source: %{name}-%{version}.tar.xz BuildRequires: %{python_module pyparsing} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} +BuildRequires: %{pythons} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: %{_bindir}/env @@ -65,8 +65,7 @@ rtslib, and configshell, or stick with all non-fb versions, since they are no longer strictly compatible. %prep -%setup -q -n %{name}-v%{version} -%patch1 -p1 +%setup -q -n %{name}-%{version} %build %python_build