diff --git a/python-filelock.spec b/python-filelock.spec index 60d7745..faa8238 100644 --- a/python-filelock.spec +++ b/python-filelock.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A platform independent file lock License: Unlicense @@ -36,10 +36,11 @@ BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster Summary: %{summary} BuildRequires: python2-devel BuildRequires: python2-setuptools +Conflicts: python%{python3_pkgversion}-%{srcname} < %{version}-%{release} %{?python_provide:%python_provide python2-%{srcname}} %if 0%{?fedora} -Recommends: %{name}-doc +Suggests: %{name}-doc %endif # with_doc %description -n python2-%{srcname} @@ -56,10 +57,11 @@ the same lock object twice, it will not block. Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +Conflicts: python2-%{srcname} < %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} %if 0%{?fedora} -Recommends: %{name}-doc +Suggests: %{name}-doc %endif # fedora %description -n python%{python3_pkgversion}-%{srcname} @@ -84,7 +86,7 @@ the same lock object twice, it will not block. %py3_build %endif # with_python3 -make -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} +%make_build -C docs html man SPHINXBUILD=sphinx-build-%{python3_version} rm docs/build/html/.buildinfo @@ -136,6 +138,10 @@ install -p -m0644 -D docs/build/man/py-%{srcname}.1 %{buildroot}%{_mandir}/man1/ %changelog +* Fri Jun 28 2019 Scott K Logan - 3.0.12-2 +- Add explicit conflict between unlike python2/3 subpackages (rhbz#1708871) +- Make the -doc subpackage dependency weaker + * Sun May 19 2019 Scott K Logan - 3.0.12-1 - Update to 3.0.12 (rhbz#1711583) - Switch to Python 3 sphinx