diff --git a/_service b/_service
index d6ea1d6..1cb6684 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
https://github.com/open-iscsi/configshell-fb.git
configshell-fb
- 1.1.fb23
- v1.1.fb23
+ 1.1.fb25
+ v1.1.fb25
enable
diff --git a/_servicedata b/_servicedata
index d1c1e08..c0ad706 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/open-iscsi/configshell-fb.git
- 1299055734eeaf849cc7d3227731626bcf127e02
\ No newline at end of file
+ 166ba97e36d7b53e7fa53d7853a8b9f5a509503c
\ No newline at end of file
diff --git a/configshell-fb-1.1.fb23.tar.xz b/configshell-fb-1.1.fb23.tar.xz
deleted file mode 100644
index b870753..0000000
--- a/configshell-fb-1.1.fb23.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4ddace5093088809d2fade0f99b217fb2736993a1fc0cc3497a9dd1c26377dd
-size 29632
diff --git a/configshell-fb-1.1.fb25.tar.xz b/configshell-fb-1.1.fb25.tar.xz
new file mode 100644
index 0000000..ec6212a
--- /dev/null
+++ b/configshell-fb-1.1.fb25.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d47870911be52e2b9e01e675daaa62378cdbadf62cccabb7b68a485cfb4eafde
+size 29744
diff --git a/configshell-fb-Handle-if-TERM-is-not-set.patch b/configshell-fb-Handle-if-TERM-is-not-set.patch
deleted file mode 100644
index 67733fa..0000000
--- a/configshell-fb-Handle-if-TERM-is-not-set.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From daa66bc6acd2430cdd05e9883dd1eab69b698252 Mon Sep 17 00:00:00 2001
-From: Andy Grover
-Date: Tue, 23 May 2017 12:00:10 -0700
-Subject: [PATCH] Handle if TERM is not set
-
-Previous patch causes problems otherwise in some cases.
-
-Signed-off-by: Andy Grover
----
- configshell/shell.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configshell/shell.py b/configshell/shell.py
-index c916366..e029c76 100644
---- a/configshell/shell.py
-+++ b/configshell/shell.py
-@@ -50,13 +50,14 @@ else:
- tty=False
-
- # remember the original setting
-- oldTerm = os.environ['TERM']
-+ oldTerm = os.environ.get('TERM')
- os.environ['TERM'] = ''
-
- import readline
-
- # restore the orignal TERM setting
-- os.environ['TERM'] = oldTerm
-+ if oldTerm != None:
-+ os.environ['TERM'] = oldTerm
- del oldTerm
-
- # Pyparsing helper to group the location of a token and its value
---
-2.15.1
-
diff --git a/configshell-fb-example-should-not-specify-path.patch b/configshell-fb-example-should-not-specify-path.patch
deleted file mode 100644
index 88b8fed..0000000
--- a/configshell-fb-example-should-not-specify-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Lee Duncan
-Date: Fri Dec 8 15:38:50 PST 2017
-Subject: remove example dependency on /usr/bin/python
-
-All of the code works with python2 or python3, so remove
-the use of the full /usr/bin/python path in the example
-script so building is easier.
-
-Signed-off-by: Lee Duncan
----
-diff -aurp a/examples/myshell b/examples/myshell
---- a/examples/myshell 2017-03-01 15:21:57.000000000 -0800
-+++ b/examples/myshell 2017-12-08 15:33:29.672794872 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- '''
- This file is part of ConfigShell.
- Copyright (c) 2011-2013 by Datera, Inc
diff --git a/python-configshell-fb.changes b/python-configshell-fb.changes
index 3742705..ed17edd 100644
--- a/python-configshell-fb.changes
+++ b/python-configshell-fb.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Oct 18 23:37:59 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Update to version 1.1.fb23:
+ * version 1.1.25
+ * Fix failing to parse param like pool/rbd;id=user
+ * Acquire a lock to a preference file before working with it
+ * Fix failing to pasre param like "cfgstr,par=val"
+ * version 1.1.fb24
+ * Remove explicit dependency on /usr/bin/python
+ * make run_cmdline() log "Running command line" msg to new loglevel
+ * tweak ConfigShell.run_stdin() to strip whitespace/newline from cmds
+ * Fix failing to pasre par=val parameters
+ * Add missing dependency on pyparsing and six
+ * Fix path regex for [ and ]
+ * Handle if TERM is not set
+ Replacing configshell-fb-1.1.fb23.tar.xz with configshell-fb-1.1.fb25.tar.xz,
+ and updating the SPEC file. Also, two patches subsumed/removed:
+ * configshell-fb-example-should-not-specify-path.patch
+ * configshell-fb-Handle-if-TERM-is-not-set.patch
+
-------------------------------------------------------------------
Sun Feb 25 08:09:45 UTC 2018 - olaf@aepfle.de
diff --git a/python-configshell-fb.spec b/python-configshell-fb.spec
index 952cc55..cd29570 100644
--- a/python-configshell-fb.spec
+++ b/python-configshell-fb.spec
@@ -17,18 +17,16 @@
%define oname configshell-fb
-%define realver 1.1.fb23
+%define realver 1.1.fb25
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-%{oname}
-Version: 1.1.fb23
+Version: 1.1.fb25
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: %{oname}-%{realver}.tar.xz
-Patch1: %{oname}-example-should-not-specify-path.patch
-Patch2: %{oname}-Handle-if-TERM-is-not-set.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pyparsing}
BuildRequires: %{python_module setuptools}
@@ -70,8 +68,6 @@ no longer strictly compatible.
%prep
%setup -q -n %{oname}-%{realver}
-%patch1 -p1
-%patch2 -p1
%build
%python_build