diff --git a/Ensure-that-all-output-reaches-the-client-when-daemo.patch b/Ensure-that-all-output-reaches-the-client-when-daemo.patch new file mode 100644 index 0000000..1336642 --- /dev/null +++ b/Ensure-that-all-output-reaches-the-client-when-daemo.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..69ea206 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + git + https://github.com/open-iscsi/configshell-fb.git + + python-configshell-fb + @PARENT_TAG@ + v(\d*\.\d*\.)fb(\d*) + \1\2 + v1.1.27 + enable + + + *configshell-fb*.tar + xz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..0a1333d --- /dev/null +++ b/_servicedata @@ -0,0 +1,6 @@ + + + https://github.com/open-iscsi/rtslib-fb.git + b37bc67fc7ed3d1ec447e9f43eb68d30dd716367 + https://github.com/open-iscsi/configshell-fb.git + 7e3b8ebe12519ad5cc20a9654a7c070b2ecf3cd8 \ No newline at end of file diff --git a/configshell-fb-1.1.26.tar.gz b/configshell-fb-1.1.26.tar.gz deleted file mode 100644 index 2e44ef7..0000000 --- a/configshell-fb-1.1.26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce909123f7e2e9bc30851f86665f63dde961e20fb9328dc5e6287ba5ce927b41 -size 34774 diff --git a/python-configshell-fb-v1.1.27.tar.xz b/python-configshell-fb-v1.1.27.tar.xz new file mode 100644 index 0000000..5e94517 --- /dev/null +++ b/python-configshell-fb-v1.1.27.tar.xz @@ -0,0 +1,3 @@ +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 7974e2e..fbfa749 100644 --- a/python-configshell-fb.changes +++ b/python-configshell-fb.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 03 17:32:48 UTC 2020 - lduncan@suse.com + +- Update to version v1.1.27 from v1.1.26 (jre#SLE-9345): + * version 1.1.27 + * Use pyparsing's locatedExpr instead of our custom helper + And updated the SPEC file, also adding a _service file. + Replacing configshell-fb-1.1.26.tar.gz with + python-configshell-fb-v1.1.27.tar.xz, and adding one + upstrem patch: + * Ensure-that-all-output-reaches-the-client-when-daemo.patch + ------------------------------------------------------------------- Mon Sep 16 17:27:49 UTC 2019 - Lee Duncan diff --git a/python-configshell-fb.spec b/python-configshell-fb.spec index d31786f..af77b46 100644 --- a/python-configshell-fb.spec +++ b/python-configshell-fb.spec @@ -1,7 +1,7 @@ # # spec file for package python-configshell-fb # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # -%define modname configshell-fb %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-%{modname} -Version: 1.1.26 +Name: python-configshell-fb +Version: 1.1.27 Release: 0%{?dist} Summary: A Python library for building configuration shells License: Apache-2.0 Group: Development/Libraries/Python -Url: http://github.com/open-iscsi/configshell-fb -Source: %{modname}-%{version}.tar.gz +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 BuildRequires: %{python_module pyparsing} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} @@ -65,7 +65,8 @@ rtslib, and configshell, or stick with all non-fb versions, since they are no longer strictly compatible. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n %{name}-v%{version} +%patch1 -p1 %build %python_build