From 3a9d584d361f02336c740592dfa2a7e8a91eeaab2578b9b897f8959c53090344 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 3 Oct 2021 20:09:17 +0000 Subject: [PATCH] Accepting request 922599 from home:schubi2 - Use libalternatives instead of update-alternatives. OBS-URL: https://build.opensuse.org/request/show/922599 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cheroot?expand=0&rev=37 --- python-cheroot.changes | 5 +++++ python-cheroot.spec | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/python-cheroot.changes b/python-cheroot.changes index d8cfc3e..1ac7941 100644 --- a/python-cheroot.changes +++ b/python-cheroot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 30 08:50:54 UTC 2021 - Stefan Schubert + +- Use libalternatives instead of update-alternatives. + ------------------------------------------------------------------- Mon Mar 29 17:49:02 UTC 2021 - Ben Greiner diff --git a/python-cheroot.spec b/python-cheroot.spec index 07ad09e..b549d07 100644 --- a/python-cheroot.spec +++ b/python-cheroot.spec @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define pypi_name cheroot %bcond_without python2 @@ -34,7 +40,7 @@ BuildRequires: %{python_module setuptools_scm >= 1.15.0} BuildRequires: %{python_module setuptools_scm_git_archive >= 1.0} BuildRequires: %{python_module six >= 1.11.0} BuildRequires: fdupes -BuildRequires: python-rpm-macros +BuildRequires: python-rpm-macros >= 20210929 %if %{with python2} BuildRequires: python-backports.functools_lru_cache BuildRequires: python-selectors2 @@ -60,8 +66,12 @@ BuildRequires: %{python_module urllib3 >= 1.25} Requires: python-jaraco.functools Requires: python-more-itertools >= 2.6 Requires: python-six >= 1.11.0 +%if %{with libalternatives} +Requires: alts +%else Requires(post): update-alternatives Requires(postun):update-alternatives +%endif # the package and distribution name is lowercase-cheroot, # but PyPI claims the name is capital-Cheroot # *smacks head against desk* @@ -98,6 +108,10 @@ pytest_opts="--ignore cheroot/test/test_wsgi.py" # test_tls_client_auth[...-False-localhost-builtin] fails ocassionally on server-side OBS %pytest $pytest_opts -k "not (test_tls_client_auth and False-localhost-builtin)" +%pre +# If libalternatives is used: Removing old update-alternatives entries. +%python_libalternatives_reset_alternative cheroot + %post %python_install_alternative cheroot