From 0b9120b2e774c4bd345b6030eb60b3bbf771f4c92b09024f81c2092bdfa68c8f Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Tue, 15 Aug 2017 20:22:01 +0000 Subject: [PATCH] Accepting request 517043 from home:TheBlackCat:branches:devel:languages:python Fix doc package dependency problem OBS-URL: https://build.opensuse.org/request/show/517043 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=8 --- python-ZODB.changes | 5 +++++ python-ZODB.spec | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/python-ZODB.changes b/python-ZODB.changes index b397b8a..b66585b 100644 --- a/python-ZODB.changes +++ b/python-ZODB.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 15 15:25:19 UTC 2017 - toddrme2178@gmail.com + +- Fix doc package dependency problem + ------------------------------------------------------------------- Sat Jul 8 07:07:44 UTC 2017 - aloisio@gmx.com diff --git a/python-ZODB.spec b/python-ZODB.spec index bf410c6..caa83c1 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -18,6 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-ZODB Version: 5.2.4 Release: 0 @@ -35,13 +36,13 @@ BuildRequires: %{python_module transaction} BuildRequires: %{python_module zc.lockfile} BuildRequires: %{python_module zdaemon >= 4.0.0} BuildRequires: %{python_module zope.interface} -# SECTION test +BuildRequires: fdupes +BuildRequires: python-rpm-macros +%if %{with test} BuildRequires: %{python_module manuel} BuildRequires: %{python_module zodbpickle >= 0.6.0} BuildRequires: %{python_module zope.testing} -# /SECTION -BuildRequires: fdupes -BuildRequires: python-rpm-macros +%endif Requires: python-BTrees Requires: python-ZConfig Requires: python-persistent @@ -52,8 +53,8 @@ Requires: python-zdaemon >= 4.0.0 Requires: python-zope.interface Requires(post): update-alternatives Requires(preun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %python_subpackages %description @@ -67,7 +68,6 @@ support, and undo. Summary: Zope Object Database: object database and persistence Group: Development/Libraries/Python Provides: %{python_module doc = %{version}} -Requires: %{name} = %{version} %description -n %{name}-doc This package contains documentation files for %{name}. @@ -93,8 +93,10 @@ rm -rf src/ZODB.egg-info %python_clone -a %{buildroot}%{_bindir}/fstail %python_clone -a %{buildroot}%{_bindir}/repozo +%if %{with test} %check %python_expand rm -f base.fs* && $python setup.py test +%endif %post %python_install_alternative fsdump fsoids fsrefs fstail repozo @@ -105,7 +107,8 @@ rm -rf src/ZODB.egg-info %files %{python_files} %defattr(-,root,root) %doc 3.11.txt CHANGES.rst COPYRIGHT.txt HISTORY.rst LICENSE.txt README.rst -%{python_sitelib}/* +%{python_sitelib}/ZODB/ +%{python_sitelib}/ZODB-%{version}-py*.egg-info %python_alternative %{_bindir}/fsdump %python_alternative %{_bindir}/fsoids %python_alternative %{_bindir}/fsrefs