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.configuration-doc.changes b/python-zope.configuration-doc.changes
deleted file mode 100644
index fcd67bd..0000000
--- a/python-zope.configuration-doc.changes
+++ /dev/null
@@ -1,33 +0,0 @@
--------------------------------------------------------------------
-Sun Jul 16 08:23:42 UTC 2017 - aloisio@gmx.com
-
-- Update to version 4.1.0
- * Drop support for Python 2.6 and 3.2.
- * Add support for Python 3.5 and 3.6.
- * Fix the domain of MessageID fields to be a native string.
- Previously on Python 3 they were bytes, which meant that they
- couldn’t be used to find translation utilities registered by
- zope.i18n. See issue 17.
-
-- 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
-
--------------------------------------------------------------------
-Fri May 15 11:28:36 UTC 2015 - benoit.monin@gmx.fr
-
-- update to version 4.0.3:
- * Added explicit support for Python 3.4.
-- point the source URL to pypi
-- add fdupes as BuildRequires and call it after install
-- pass -q to the test to avoid spamming the build log
-- rename CHANGES.txt to CHANGES.rst: changed upstream
-- rename README.txt to README.rst: changed upstream
-
--------------------------------------------------------------------
-Mon Jul 29 14:32:46 UTC 2013 - hpj@urpla.net
-
-- version 4.0.2: initial build
-
diff --git a/python-zope.configuration-doc.spec b/python-zope.configuration-doc.spec
deleted file mode 100644
index 50fca3c..0000000
--- a/python-zope.configuration-doc.spec
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# spec file for package python-zope.configuration-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.configuration-doc
-Version: 4.1.0
-Release: 0
-Summary: Documentation for python-zope.configuration
-License: ZPL-2.1
-Group: Development/Languages/Python
-Url: http://www.python.org/pypi/zope.configuration
-Source: https://files.pythonhosted.org/packages/source/z/zope.configuration/zope.configuration-%{version}.tar.gz
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module zope.configuration = %{version}}
-# SECTION documentation requirements
-BuildRequires: python3-Sphinx
-BuildRequires: python3-repoze.sphinx.autointerface
-# /SECTION
-# SECTION test requirements
-BuildRequires: %{python_module zope.testrunner}
-# /SECTION
-BuildRequires: python-rpm-macros
-Requires: python-zope.i18nmessageid
-Requires: python-zope.interface
-Requires: python-zope.schema
-Provides: %{python_module zope.configuration-doc = %{version}}
-BuildArch: noarch
-
-%description
-Contains documentation for python-zope.configuration
-
-%prep
-%setup -q -n zope.configuration-%{version}
-
-%build
-%{_python_use_flavor python3}
-%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
-
-%install
-# nothing to do
-
-%check
-%python_exec %{_bindir}/zope-testrunner --test-path=src -v
-
-%files
-%defattr(-,root,root)
-%doc build/sphinx/html/
-
-%changelog
diff --git a/python-zope.configuration.changes b/python-zope.configuration.changes
index fcd67bd..907528a 100644
--- a/python-zope.configuration.changes
+++ b/python-zope.configuration.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Apr 4 16:05:28 UTC 2019 - Marketa Calabkova
+
+- update to version 4.3.1
+ 4.2.0
+ * Reach 100% automated test coverage.
+ * Add support for Python 3.7.
+ * Drop support for Python 3.3.
+ * Drop support for python setup.py test.
+ * Fix the doctests with zope.schema 4.7 and above.
+ * More classes and exceptions enhancements.
+ 4.2.1
+ * Fix GlobalObject no longer allowing just a single ‘.’.
+ 4.2.2
+ * Fix GlobalObject no longer allowing multiple leading dots.
+ * Add __all__ to all modules listing the documented members of
+ the module.
+ 4.3.0
+ * Simplify exception chaining and nested exception error messages.
+ 4.3.1
+ * Do not break when running the tests from a wheel.
+- drop *-doc subpackage, use multibuild instead
+
-------------------------------------------------------------------
Sun Jul 16 08:23:42 UTC 2017 - aloisio@gmx.com
diff --git a/python-zope.configuration.spec b/python-zope.configuration.spec
index bb924b0..0f53156 100644
--- a/python-zope.configuration.spec
+++ b/python-zope.configuration.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-zope.configuration
#
-# 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,29 +13,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/
#
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-zope.configuration
-Version: 4.1.0
+Name: python-zope.configuration%{psuffix}
+Version: 4.3.1
Release: 0
Summary: Zope Configuration Markup Language (ZCML)
License: ZPL-2.1
Group: Development/Languages/Python
-Url: http://www.python.org/pypi/zope.configuration
+URL: http://www.python.org/pypi/zope.configuration
Source: https://files.pythonhosted.org/packages/source/z/zope.configuration/zope.configuration-%{version}.tar.gz
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module zope.i18nmessageid}
-BuildRequires: %{python_module zope.interface}
-BuildRequires: %{python_module zope.schema}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-zope.i18nmessageid
Requires: python-zope.interface
-Requires: python-zope.schema
+Requires: python-zope.schema >= 4.9
BuildArch: noarch
+%if %{with test}
+BuildRequires: %{python_module manuel}
+BuildRequires: %{python_module zope.i18nmessageid}
+BuildRequires: %{python_module zope.interface}
+BuildRequires: %{python_module zope.schema >= 4.9}
+BuildRequires: %{python_module zope.testing}
+BuildRequires: %{python_module zope.testrunner}
+%endif
%python_subpackages
%description
@@ -55,12 +68,21 @@ rm -rf zope.configuration.egg-info
%python_build
%install
+%if !%{with test}
%python_install
%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 CHANGES.rst COPYRIGHT.txt LICENSE.txt README.rst
+%license LICENSE.txt
+%doc CHANGES.rst COPYRIGHT.txt README.rst
%{python_sitelib}/*
+%endif
%changelog
diff --git a/zope.configuration-4.1.0.tar.gz b/zope.configuration-4.1.0.tar.gz
deleted file mode 100644
index 152a71a..0000000
--- a/zope.configuration-4.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eebea03062b9d7ddd512a31412bcdf3549aa2dff481503487067dbbd06774050
-size 77780
diff --git a/zope.configuration-4.3.1.tar.gz b/zope.configuration-4.3.1.tar.gz
new file mode 100644
index 0000000..f8b262e
--- /dev/null
+++ b/zope.configuration-4.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1
+size 83223