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.schema-doc.changes b/python-zope.schema-doc.changes
deleted file mode 100644
index 8872b67..0000000
--- a/python-zope.schema-doc.changes
+++ /dev/null
@@ -1,58 +0,0 @@
--------------------------------------------------------------------
-Tue Dec 4 13:11:31 UTC 2018 - Matej Cepl
-
-- Remove superfluous devel dependency for noarch package
-
--------------------------------------------------------------------
-Thu Jul 13 20:31:17 UTC 2017 - aloisio@gmx.com
-
-- Converted to single-spec
-- 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)
-
--------------------------------------------------------------------
-Fri May 15 13:11:18 UTC 2015 - benoit.monin@gmx.fr
-
-- update to version 4.4.2:
- * Fix description of min max field: max value is included,
- not excluded.
-- additional changes from version 4.4.1:
- * Added support for Python 3.4.
-- switch the source archive to tar.gz (zip not available)
-- remove unzip from BuildRequires
-- pass -q to test to avoid spamming the build log
-
--------------------------------------------------------------------
-Fri Feb 28 20:02:35 UTC 2014 - os-dev@jacraig.com
-
-- Update to 4.4.0:
- * Add an event on field properties to notify that a field has been updated.
- This event enables definition of subscribers based on an event, a context
- and a field. The event contains also the old value and the new value.
- (also see package ``zope.schemaevent`` that define a field event handler)
-- Changes from 4.3.3:
- * PEP 8 cleanup.
- * Don't raise RequiredMissing if a field's defaultFactory returns the field's
- missing_value.
- * Updated ``boostrap.py`` to version 2.2.
- * Add the ability to swallow ValueErrors when rendering a SimpleVocabulary,
- allowing for cases where vocabulary items may be duplicated (e.g., due to
- user input).
- * It was a pain that ``ConstraintNotSatisfied`` did not tell the field name.
-
--------------------------------------------------------------------
-Mon Jul 29 12:16:07 UTC 2013 - hpj@urpla.net
-
-- generate separate -doc package
-
--------------------------------------------------------------------
-Wed Mar 20 10:50:22 UTC 2013 - speilicke@suse.com
-
-- Add (Build)Requires python-ordereddict for SLE_11 only
-
--------------------------------------------------------------------
-Fri Mar 15 13:44:06 UTC 2013 - speilicke@suse.com
-
-- Initial version
-
diff --git a/python-zope.schema-doc.spec b/python-zope.schema-doc.spec
deleted file mode 100644
index bedc234..0000000
--- a/python-zope.schema-doc.spec
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# spec file for package python-zope.schema-doc
-#
-# Copyright (c) 2018 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
-# 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 https://bugs.opensuse.org/
-#
-
-
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-zope.schema-doc
-Version: 4.4.2
-Release: 0
-Summary: Zope interface extension for defining data schemas
-License: ZPL-2.1
-Group: Development/Languages/Python
-Url: https://pypi.python.org/pypi/zope.schema
-Source: https://files.pythonhosted.org/packages/source/z/zope.schema/zope.schema-%{version}.tar.gz
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module zope.schema = %{version}}
-BuildRequires: python-rpm-macros
-# SECTION documentation requirements
-BuildRequires: python3-Sphinx
-# /SECTION
-# SECTION test requirements
-BuildRequires: %{python_module zope.event}
-BuildRequires: %{python_module zope.interface >= 3.6.0}
-BuildRequires: %{python_module zope.testing}
-BuildRequires: %{python_module zope.testrunner}
-# /SECTION
-Requires: python-zope.event
-Requires: python-zope.interface >= 3.6.0
-Provides: %{python_module zope.schema-doc = %{version}}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-
-%description
-Contains documentation for python-zope-schema
-
-%prep
-%setup -q -n zope.schema-%{version}
-
-%build
-# Generate HTML documentation
-%{_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.schema.changes b/python-zope.schema.changes
index 8872b67..72b88f4 100644
--- a/python-zope.schema.changes
+++ b/python-zope.schema.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Tue Apr 2 11:44:31 UTC 2019 - Marketa Calabkova
+
+- update to version 4.9.3
+ 4.5.0:
+ * Add support for Python 3.5 and 3.6.
+ * Drop support for Python 2.6, 3.2, and 3.3.
+ * Drop support for ‘setup.py test’. Use zope.testrunner instead.
+ 4.6.0
+ * Add support for Python 3.7.
+ * Choice, SimpleVocabulary and SimpleTerm all gracefully handle
+ using Unicode token values with non-ASCII characters by encoding
+ them with the backslashreplace error handler.
+ * Add fields and interfaces representing Python’s numeric tower.
+ * More various enhancements.
+ 4.6.1
+ * Fix the Field constructor to again allow MessageID values for
+ the description.
+ 4.6.2
+ * Fix checking a field’s constraint to set the field and value
+ properties if the constraint raises a ValidationError.
+ 4.7.0
+ * Give various classes some fields.
+ 4.8.0
+ * Fix passing None as the description to a field constructor.
+ 4.9.0
+ * Make NativeString and NativeStringLine distinct types.
+ * Fix Field.getDoc() when value_type or key_type is present.
+ * Make DottedName accept leading underscores for each segment.
+ 4.9.1
+ * Fix SimpleTerm token for non-ASCII bytes values.
+ 4.9.2
+ * Make sure that the title for IObject.validate_invariants is a
+ unicode string.
+ 4.9.3
+ * Fixed a ReST error in getDoc() results when having “subfields”
+ with titles.
+- drop *-doc subpackage, use multibuild instead
+
-------------------------------------------------------------------
Tue Dec 4 13:11:31 UTC 2018 - Matej Cepl
diff --git a/python-zope.schema.spec b/python-zope.schema.spec
index 6307a8d..7ea41f9 100644
--- a/python-zope.schema.spec
+++ b/python-zope.schema.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-zope.schema
#
-# 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
@@ -17,8 +17,16 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-zope.schema
-Version: 4.4.2
+%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.schema%{psuffix}
+Version: 4.9.3
Release: 0
Summary: Zope interface extension for defining data schemas
License: ZPL-2.1
@@ -30,6 +38,13 @@ BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-zope.event
Requires: python-zope.interface >= 3.6.0
+%if %{with test}
+BuildRequires: %{python_module zope.event}
+BuildRequires: %{python_module zope.i18nmessageid}
+BuildRequires: %{python_module zope.interface}
+BuildRequires: %{python_module zope.testing}
+BuildRequires: %{python_module zope.testrunner}
+%endif
BuildArch: noarch
%python_subpackages
@@ -51,12 +66,21 @@ rm -rf zope.schema.egg-info
%python_build
%install
+%if !%{with test}
%python_install
%python_expand %fdupes -s %{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}
%license LICENSE.txt
%doc COPYRIGHT.txt CHANGES.rst README.rst
%{python_sitelib}/*
+%endif
%changelog
diff --git a/zope.schema-4.4.2.tar.gz b/zope.schema-4.4.2.tar.gz
deleted file mode 100644
index 972e5bf..0000000
--- a/zope.schema-4.4.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d32a089d2a774fe67fd19864780e12ebd88d09e89b5c780f6c0795d59b1c24dd
-size 252161
diff --git a/zope.schema-4.9.3.tar.gz b/zope.schema-4.9.3.tar.gz
new file mode 100644
index 0000000..0d522ba
--- /dev/null
+++ b/zope.schema-4.9.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d971da8707cab47b1916534b9929dcd9d7f23aed790e6b4cbe3103d5b18069d
+size 98217