From e28428f626c1968938e84b2ee52287e1f7baac01e443edb8d9dff22d50589faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 26 Mar 2019 14:35:21 +0000
Subject: [PATCH] - Update to 2.2.0:   * No upstream changelog - Remove merged
 use_2to3.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jaraco.text?expand=0&rev=6
---
 _multibuild                |  3 ---
 jaraco.text-2.0.tar.gz     |  3 ---
 jaraco.text-3.0.tar.gz     |  3 +++
 python-jaraco.text.changes |  7 +++++++
 python-jaraco.text.spec    | 29 +++++------------------------
 5 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 _multibuild
 delete mode 100644 jaraco.text-2.0.tar.gz
 create mode 100644 jaraco.text-3.0.tar.gz

diff --git a/_multibuild b/_multibuild
deleted file mode 100644
index fcc7b97..0000000
--- a/_multibuild
+++ /dev/null
@@ -1,3 +0,0 @@
-<multibuild>
-  <package>test</package>
-</multibuild>
diff --git a/jaraco.text-2.0.tar.gz b/jaraco.text-2.0.tar.gz
deleted file mode 100644
index d07fde5..0000000
--- a/jaraco.text-2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa
-size 12017
diff --git a/jaraco.text-3.0.tar.gz b/jaraco.text-3.0.tar.gz
new file mode 100644
index 0000000..e3e1b5d
--- /dev/null
+++ b/jaraco.text-3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddebeab77d3c144e1782b75313e2cda873b40b728230af5401b2a7bfa5c0b0d0
+size 12082
diff --git a/python-jaraco.text.changes b/python-jaraco.text.changes
index e1aade0..46cab63 100644
--- a/python-jaraco.text.changes
+++ b/python-jaraco.text.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 26 14:34:01 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 3.0:
+  * Remove collections dependency to avoid buildcycle
+- Remove multibuild as per above
+
 -------------------------------------------------------------------
 Wed Feb 27 19:08:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-jaraco.text.spec b/python-jaraco.text.spec
index 542b3fe..c438514 100644
--- a/python-jaraco.text.spec
+++ b/python-jaraco.text.spec
@@ -17,16 +17,8 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "test"
-%define psuffix -test
-%bcond_without test
-%else
-%define psuffix %{nil}
-%bcond_with test
-%endif
-Name:           python-jaraco.text%{psuffix}
-Version:        2.0
+Name:           python-jaraco.text
+Version:        3.0
 Release:        0
 Summary:        Tools to work with text
 License:        MIT
@@ -34,6 +26,8 @@ Group:          Development/Languages/Python
 URL:            https://github.com/jaraco/jaraco.text
 Source0:        https://files.pythonhosted.org/packages/source/j/jaraco.text/jaraco.text-%{version}.tar.gz
 BuildRequires:  %{python_module jaraco.base >= 6.1}
+BuildRequires:  %{python_module jaraco.functools}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -43,11 +37,6 @@ Requires:       python-jaraco.collections
 Requires:       python-jaraco.functools
 Requires:       python-six
 BuildArch:      noarch
-%if %{with test}
-BuildRequires:  %{python_module jaraco.collections}
-BuildRequires:  %{python_module jaraco.functools}
-BuildRequires:  %{python_module pytest}
-%endif
 %python_subpackages
 
 %description
@@ -62,7 +51,6 @@ rm -rf jaraco.text.egg-info
 %python_build
 
 %install
-%if !%{with test}
 %python_install
 
 %{python_expand rm -f %{buildroot}%{$python_sitelib}/jaraco/__init__.py* \
@@ -71,22 +59,15 @@ $python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jarac
 $python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jaraco/
 %fdupes %{buildroot}%{$python_sitelib}
 }
-%endif
 
 %check
-%if %{with test}
-%{python_expand py.test-%{$python_bin_suffix} \
-  --ignore=_build.python2 --ignore=_build.python3
-}
-%endif
+%pytest
 
-%if !%{with test}
 %files %{python_files}
 %license LICENSE
 %doc docs/*.rst README.rst CHANGES.rst
 %{python_sitelib}/jaraco.text-%{version}-py*.egg-info
 %{python_sitelib}/jaraco/text.py*
 %pycache_only %{python_sitelib}/jaraco/__pycache__/text*.py*
-%endif
 
 %changelog