diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
diff --git a/jaraco.text-1.10.1.tar.gz b/jaraco.text-1.10.1.tar.gz
deleted file mode 100644
index 958e7eb..0000000
--- a/jaraco.text-1.10.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1b29e833f317629a7c8aff3c03521e61e1df6da188d7fa2f698b0281e1a5a2b
-size 8790
diff --git a/jaraco.text-2.0.tar.gz b/jaraco.text-2.0.tar.gz
new file mode 100644
index 0000000..d07fde5
--- /dev/null
+++ b/jaraco.text-2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa
+size 12017
diff --git a/python-jaraco.text.changes b/python-jaraco.text.changes
index 77540f9..e1aade0 100644
--- a/python-jaraco.text.changes
+++ b/python-jaraco.text.changes
@@ -1,4 +1,24 @@
+-------------------------------------------------------------------
+Wed Feb 27 19:08:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Use multibuild to avoid buildcycle
+
+-------------------------------------------------------------------
+Tue Feb 26 07:00:39 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
+
+- Add LICENSE
+- Compile manually due to switch to pkgutil namespace technique
+- Add fdupes
+- Remove bcond_with test, allowing tests suite to run
+- Add missing build dependency jaraco.collections
+- Remove undesirable build dependencies pytest-flake8, pytest-sugar and
+  collective.checkdocs
+- Add missing runtime dependencies six, jaraco.base, jaraco.collections
+  and jaraco.functools
+- Update to v2.0
+  * Switch to pkgutil namespace technique for the ``jaraco`` namespace.
+
 -------------------------------------------------------------------
 Thu Aug 23 10:51:49 UTC 2018 - dheidler@suse.de
 
-- Initial Package
+- Initial Package for v1.10.1
diff --git a/python-jaraco.text.spec b/python-jaraco.text.spec
index f3d04f1..542b3fe 100644
--- a/python-jaraco.text.spec
+++ b/python-jaraco.text.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-jaraco.text
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,34 +12,42 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with     test
-Name:           python-jaraco.text
-Version:        1.10.1
+%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
 Release:        0
 Summary:        Tools to work with text
 License:        MIT
 Group:          Development/Languages/Python
-Url:            https://github.com/jaraco/jaraco.text
+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 base}
-BuildRequires:  %{python_module jaraco.base}
-BuildRequires:  %{python_module jaraco.functools}
-BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module jaraco.base >= 6.1}
 BuildRequires:  %{python_module setuptools_scm}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python-jaraco.base >= 6.1
+Requires:       python-jaraco.collections
+Requires:       python-jaraco.functools
+Requires:       python-six
+BuildArch:      noarch
 %if %{with test}
-BuildRequires:  %{python_module pytest-sugar}
-BuildRequires:  %{python_module collective.checkdocs}
-BuildRequires:  %{python_module pytest-flake8}
+BuildRequires:  %{python_module jaraco.collections}
+BuildRequires:  %{python_module jaraco.functools}
 BuildRequires:  %{python_module pytest}
 %endif
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -47,26 +55,38 @@ jaraco.text Tools for working with text.
 
 %prep
 %setup -q -n jaraco.text-%{version}
-sed -i -e "s/'pytest_runner'/'pytest-runner'/" setup.py
+sed -i 's/--flake8//' pytest.ini
 rm -rf jaraco.text.egg-info
 
 %build
 %python_build
 
 %install
+%if !%{with test}
 %python_install
-%{python_expand rm -r %{buildroot}%{$python_sitelib}/jaraco.text-%{version}-py*-nspkg.pth}
 
-%if %{with test}
-%check
-%python_expand py.test-%{$python_bin_suffix}
+%{python_expand rm -f %{buildroot}%{$python_sitelib}/jaraco/__init__.py* \
+  %{buildroot}%{$python_sitelib}/jaraco/__pycache__/__init__.*
+$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jaraco/
+$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
+
+%if !%{with test}
 %files %{python_files}
-%defattr(-,root,root)
+%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