diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ test
+
diff --git a/python-zope.location-doc.changes b/python-zope.location-doc.changes
deleted file mode 100644
index 3565134..0000000
--- a/python-zope.location-doc.changes
+++ /dev/null
@@ -1,18 +0,0 @@
--------------------------------------------------------------------
-Thu Jul 13 22:39:07 UTC 2017 - aloisio@gmx.com
-
-- Update to version 4.0.3
- * Added Python 3.4 support.
- * Updated boostrap.py to version 2.2.
-
-- Split docs and tests into separate -doc package since running
- tests and sometimes building docs had become very messy.
- Also see (gh#/zopefoundation/zope.proxy#18)
-
-- Converted to single-spec
-
--------------------------------------------------------------------
-Mon Jul 29 09:48:26 UTC 2013 - hpj@urpla.net
-
-- version 4.0.2: initial build
-
diff --git a/python-zope.location-doc.spec b/python-zope.location-doc.spec
deleted file mode 100644
index f9402be..0000000
--- a/python-zope.location-doc.spec
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# spec file for package python-zope.location-doc
-#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2013 LISA GmbH, Bingen, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# 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/
-#
-
-
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-zope.location-doc
-Version: 4.0.3
-Release: 0
-Summary: Documentation for python-zope.location
-License: ZPL-2.1
-Group: Development/Languages/Python
-Url: http://www.python.org/pypi/zope.location
-Source: https://files.pythonhosted.org/packages/source/z/zope.location/zope.location-%{version}.tar.gz
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module zope.location = %{version}}
-# SECTION documentation requirements
-BuildRequires: python3-Sphinx
-BuildRequires: python3-repoze.sphinx.autointerface
-# /SECTION
-# SECTION testing requirements
-BuildRequires: %{python_module zope.testrunner}
-# /SECTION
-BuildRequires: python-rpm-macros
-Provides: %{python_module zope.location-doc = %{version}}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-
-%description
-Contains documentation for python-zope.location.
-
-%prep
-%setup -q -n zope.location-%{version}
-
-%build
-%{_python_use_flavor python3}
-%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo build/sphinx/html/objects.inv
-
-%install
-# nothing to do here
-
-%check
-%python_exec %{_bindir}/zope-testrunner --test-path=src -v
-
-%files
-%defattr(-,root,root,-)
-%doc build/sphinx/html/
-
-%changelog
diff --git a/python-zope.location.changes b/python-zope.location.changes
index 3565134..3ac1c27 100644
--- a/python-zope.location.changes
+++ b/python-zope.location.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 5 11:13:00 UTC 2019 - Marketa Calabkova
+
+- update to version 4.2
+ * Add support for Python 3.5, 3.6 and 3.7.
+ * Drop support for Python 2.6, 3.2 and 3.3.
+ * Add a page to the docs on hacking zope.location.
+ * Note additional documentation dependencies.
+ * Remove internal _compat implementation module.
+- drop *-doc subpackage, use multibuild instead.
+
-------------------------------------------------------------------
Thu Jul 13 22:39:07 UTC 2017 - aloisio@gmx.com
diff --git a/python-zope.location.spec b/python-zope.location.spec
index 97437a8..666fd17 100644
--- a/python-zope.location.spec
+++ b/python-zope.location.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-zope.location
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013 LISA GmbH, Bingen, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -13,13 +13,21 @@
# 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-%{**}}
-Name: python-zope.location
-Version: 4.0.3
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name: python-zope.location%{psuffix}
+Version: 4.2
Release: 0
Summary: Zope Location
License: ZPL-2.1
@@ -34,6 +42,13 @@ Requires: python-zope.interface >= 4.0.2
Requires: python-zope.proxy >= 4.0.1
Requires: python-zope.schema >= 4.2.2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with test}
+BuildRequires: %{python_module zope.component >= 4.0.1}
+BuildRequires: %{python_module zope.configuration}
+BuildRequires: %{python_module zope.copy >= 4.0}
+BuildRequires: %{python_module zope.proxy}
+BuildRequires: %{python_module zope.testrunner}
+%endif
BuildArch: noarch
%python_subpackages
@@ -48,12 +63,21 @@ rm -rf src/zope.location.egg-info
%python_build
%install
+%if !%{with test}
%python_install
-%python_expand %fdupes -s %{buildroot}%{$python_sitelib}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
+%if %{with test}
+%check
+%python_expand PYTHONPATH=src %{_bindir}/zope-testrunner-%{$python_bin_suffix} -vvv --test-path src
+%endif
+
+%if !%{with test}
%files %{python_files}
%defattr(-,root,root,-)
%doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst
%{python_sitelib}/*
+%endif
%changelog
diff --git a/zope.location-4.0.3.tar.gz b/zope.location-4.0.3.tar.gz
deleted file mode 100644
index cc894f8..0000000
--- a/zope.location-4.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e43ccebeb86689d3af8307f97fa06e75807541e3ff6e61111cdb473d896a49da
-size 154077
diff --git a/zope.location-4.2.tar.gz b/zope.location-4.2.tar.gz
new file mode 100644
index 0000000..ebb8a88
--- /dev/null
+++ b/zope.location-4.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac
+size 30255