Hello community,
here is the log from the commit of package python-configshell-fb for
openSUSE:Factory checked in at 2017-12-29 00:03:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-configshell-fb (Old)
and /work/SRC/openSUSE:Factory/.python-configshell-fb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-configshell-fb"
Fri Dec 29 00:03:14 2017 rev:5 rq:557437 version:1.1.fb23
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-configshell-fb/python-configshell-fb.changes
2017-09-12 19:53:12.229561891 +0200
+++
/work/SRC/openSUSE:Factory/.python-configshell-fb.new/python-configshell-fb.changes
2017-12-29 00:03:22.972781299 +0100
@@ -1,0 +2,16 @@
+Fri Dec 8 19:34:23 UTC 2017 - [email protected]
+
+- Converting RPM SPEC file to singlespec format (bsc#1045332),
+ adding patch:
+ * configshell-fb-example-should-not-specify-path.patch
+- Fix targetcli.service problem when TERM not set (bsc#1071194),
+ adding patch (from LSZhu):
+ * configshell-fb-Handle-if-TERM-is-not-set.patch
+- Moved build requirement on urwid to runtime requirement,
+ as suggested by scarabeus_iv
+- ran spec-cleaner to clean up SPEC file
+- Converted from manually-added configshell-fb tar file to
+ tar_scm service-generated file by adding _service and
+ _servicedata
+
+-------------------------------------------------------------------
Old:
----
v1.1.fb23.tar.gz
New:
----
_service
_servicedata
configshell-fb-1.1.fb23.tar.xz
configshell-fb-Handle-if-TERM-is-not-set.patch
configshell-fb-example-should-not-specify-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-configshell-fb.spec ++++++
--- /var/tmp/diff_new_pack.WEzqmS/_old 2017-12-29 00:03:23.760555492 +0100
+++ /var/tmp/diff_new_pack.WEzqmS/_new 2017-12-29 00:03:23.764554345 +0100
@@ -18,27 +18,30 @@
%define oname configshell-fb
%define realver 1.1.fb23
-
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-%{oname}
-Version: 1.23
-Release: 1%{?dist}
-Url: http://github.com/open-iscsi/configshell-fb
+Version: 1.1.fb23
+Release: 0%{?dist}
Summary: A Python library for building configuration shells
License: Apache-2.0
Group: Development/Libraries/Python
-Source:
https://github.com/open-iscsi/%{oname}/archive/v%{realver}.tar.gz
-Requires: /usr/bin/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}
+BuildRequires: %{python_module six}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+Requires: %{_bindir}/env
Requires: python-pyparsing
Requires: python-six
-BuildArch: noarch
+Requires: python-urwid
Conflicts: python-configshell
-BuildRequires: fdupes
-BuildRequires: python-devel
-BuildRequires: python-pyparsing
-BuildRequires: python-setuptools
-BuildRequires: python-six
-BuildRequires: python-urwid
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+%python_subpackages
%description
configshell-fb is a Python library that provides a framework for building
simple
@@ -53,7 +56,6 @@
%package doc
Summary: Documentation for Python configshell-fb
Group: Documentation/HTML
-BuildArch: noarch
BuildRequires: epydoc
%description doc
@@ -67,28 +69,26 @@
no longer strictly compatible.
%prep
-%setup -q -n %{oname}-%{realver}%{?extraver}
+%setup -q -n %{oname}-%{realver}
+%patch1 -p1
+%patch2 -p1
%build
-%__python setup.py build
-%__mkdir_p doc/
+%python_build
+mkdir -p doc/
epydoc --no-sourcecode --html -n %{oname} --exclude configobj configshell/*.py
-%__mv html doc/
+%fdupes html/
+mv html doc/
%install
-%__python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
-%fdupes %{buildroot}%{python_sitelib}
-%__install -d -m755
%{buildroot}%{_defaultdocdir}/python-configshell-doc-%{version}
-%__cp -r doc/* %{buildroot}%{_defaultdocdir}/python-configshell-doc-%{version}/
-%fdupes %{buildroot}%{_defaultdocdir}
+%python_install --skip-build
+%fdupes %{buildroot}
-%files
-%defattr(-,root,root)
+%files %{python_files}
%{python_sitelib}/*
%doc examples COPYING README.md
-%files doc
-%defattr(-,root,root)
-%{_defaultdocdir}/python-configshell-doc-%{version}
+%files %{python_files doc}
+%doc doc/*
%changelog
++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/open-iscsi/configshell-fb.git</param>
<param name="subdir"></param>
<param name="filename">configshell-fb</param>
<param name="versionformat">1.1.fb23</param>
<param name="revision">v1.1.fb23</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*configshell-fb*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/open-iscsi/configshell-fb.git</param>
<param
name="changesrevision">1299055734eeaf849cc7d3227731626bcf127e02</param></service></servicedata>++++++
configshell-fb-Handle-if-TERM-is-not-set.patch ++++++
>From daa66bc6acd2430cdd05e9883dd1eab69b698252 Mon Sep 17 00:00:00 2001
From: Andy Grover <[email protected]>
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 <[email protected]>
---
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
++++++ configshell-fb-example-should-not-specify-path.patch ++++++
From: Lee Duncan <[email protected]>
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 <[email protected]>
---
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
