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/pre_checkin.sh b/pre_checkin.sh
deleted file mode 100644
index 479d9a0..0000000
--- a/pre_checkin.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cp python-zope.component.changes python-zope.component-doc.changes
-
diff --git a/python-zope.component-doc.changes b/python-zope.component-doc.changes
deleted file mode 100644
index af28431..0000000
--- a/python-zope.component-doc.changes
+++ /dev/null
@@ -1,51 +0,0 @@
--------------------------------------------------------------------
-Sun Jul 16 08:15:36 UTC 2017 - aloisio@gmx.com
-
-- Update to version 4.3.0
- * When testing PURE_PYTHON environments under tox, avoid
- poisoning the user’s global wheel cache.
- * Drop support for Python 2.6 and 3.2.
- * Add support for Python 3.5.
- 4.2.2:
- * Fix test cases for PyPy and PyPy3.
-
-- Split docs and tests into separate package to avoid dependency
- loop.
-
-- Converted to single-spec
-
--------------------------------------------------------------------
-Fri May 15 11:13:54 UTC 2015 - benoit.monin@gmx.fr
-
-- update to version 4.2.1:
- * Added support for Python 3.4.
-- switch source archive to tar.gz (zip not available)
-- remove unzip from BuildRequires
-
--------------------------------------------------------------------
-Wed Feb 19 04:08:29 UTC 2014 - os-dev@jacraig.com
-
-- Update to 4.2.0:
- * Updated ``boostrap.py`` to version 2.2.
- * Reset the cached ``adapter_hooks`` at ``zope.testing.cleanup.cleanUp``
- time (LP1100501).
- * Implemented ability to specify adapter and utility names in Python. Use
- the ``@zope.component.named(name)`` decorator to specify the name.
-- Update python-zope.interface requirement version (see setup.py).
-
--------------------------------------------------------------------
-Tue Dec 10 13:13:28 UTC 2013 - p.drouand@gmail.com
-
-- Use download Url as source
-- Add unzip requirement to support tarball format
-
--------------------------------------------------------------------
-Wed Jul 31 08:57:22 UTC 2013 - hpj@urpla.net
-
-- disable testing due to circular dependency with python-zope.security
-
--------------------------------------------------------------------
-Mon Jul 29 21:43:49 UTC 2013 - hpj@urpla.net
-
-- version 4.1.0: initial build
-
diff --git a/python-zope.component-doc.spec b/python-zope.component-doc.spec
deleted file mode 100644
index a3c373e..0000000
--- a/python-zope.component-doc.spec
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# spec file for package python-zope.component-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.component-doc
-Version: 4.3.0
-Release: 0
-Summary: Documentation for python-zope.component
-License: ZPL-2.1
-Group: Development/Languages/Python
-Url: http://www.python.org/pypi/zope.component
-Source: https://files.pythonhosted.org/packages/source/z/zope.component/zope.component-%{version}.tar.gz
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module zope.component = %{version}}
-# SECTION documentation requirements
-BuildRequires: python3-Sphinx
-BuildRequires: python3-repoze.sphinx.autointerface
-# /SECTION
-# SECTION testing requirements
-BuildRequires: %{python_module persistent}
-BuildRequires: %{python_module zope.configuration}
-BuildRequires: %{python_module zope.proxy}
-BuildRequires: %{python_module zope.security}
-BuildRequires: %{python_module zope.testrunner}
-#/SECTION
-BuildRequires: fdupes
-BuildRequires: python-rpm-macros
-Provides: %{python_module zope.component-doc = %{version}}
-BuildArch: noarch
-
-%description
-This package contains documentation files for python-zope.component.
-
-%prep
-%setup -q -n zope.component-%{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.component.changes b/python-zope.component.changes
index af28431..2563f15 100644
--- a/python-zope.component.changes
+++ b/python-zope.component.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Apr 8 15:05:42 UTC 2019 - Marketa Calabkova
+
+- update to version 4.5
+ * Add support for Python 3.6 and 3.7.
+ * Drop support for Python 3.3.
+ * Drop support for “setup.py test”.
+ * Always install zope.hookable as a dependency.
+ * Make accessing names that have been moved to zope.interface
+ produce a DeprecationWarning.
+- Drop the *-doc subpackage, use multibuild instead.
+ * Drop pre-checkin.sh as it is no longer needed.
+
-------------------------------------------------------------------
Sun Jul 16 08:15:36 UTC 2017 - aloisio@gmx.com
diff --git a/python-zope.component.spec b/python-zope.component.spec
index 69f02dc..2bfa7c5 100644
--- a/python-zope.component.spec
+++ b/python-zope.component.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-zope.component
#
-# 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.component
-Version: 4.3.0
+%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.component%{psuffix}
+Version: 4.5
Release: 0
Summary: Zope Component Architecture
License: ZPL-2.1
@@ -29,8 +37,23 @@ Source: https://files.pythonhosted.org/packages/source/z/zope.component/
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
+Requires: python-zope.deferredimport >= 4.2.1
+Requires: python-zope.deprecation >= 4.3.0
Requires: python-zope.event
+Requires: python-zope.hookable >= 4.2.0
Requires: python-zope.interface >= 4.1.0
+#test requirements
+%if %{with test}
+BuildRequires: %{python_module persistent}
+BuildRequires: %{python_module zope.deferredimport}
+BuildRequires: %{python_module zope.hookable}
+BuildRequires: %{python_module zope.interface}
+BuildRequires: %{python_module zope.location}
+BuildRequires: %{python_module zope.proxy}
+BuildRequires: %{python_module zope.security}
+BuildRequires: %{python_module zope.testing}
+BuildRequires: %{python_module zope.testrunner}
+%endif
%python_subpackages
%description
@@ -52,12 +75,21 @@ rm -rf src/zope.component.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 CHANGES.rst COPYRIGHT.txt LICENSE.txt README.rst
%{python_sitelib}/*
+%endif
%changelog
diff --git a/zope.component-4.3.0.tar.gz b/zope.component-4.3.0.tar.gz
deleted file mode 100644
index c782863..0000000
--- a/zope.component-4.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb4136c7443610f8c2d2d357cad247c3e90bb5e6f0b7a02b0edfb11924ff9bc2
-size 85971
diff --git a/zope.component-4.5.tar.gz b/zope.component-4.5.tar.gz
new file mode 100644
index 0000000..32c4a44
--- /dev/null
+++ b/zope.component-4.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55
+size 85256