From e3020a672bafbd1a636210ff4cc89197d86dee75696c013d27ee0b6b9f6aedfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 7 Feb 2025 18:17:29 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-httpx revision 9d36e902bf61b443c9c681187d36bcaf --- python-httpx.changes | 5 +++++ python-httpx.spec | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/python-httpx.changes b/python-httpx.changes index 0afed8c..d0493ba 100644 --- a/python-httpx.changes +++ b/python-httpx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 17 14:03:29 UTC 2025 - Nico Krapp + +- Use libalternatives instead of update-alternatives, bsc#1235784 + ------------------------------------------------------------------- Sun Sep 8 13:05:12 UTC 2024 - Dirk Müller diff --git a/python-httpx.spec b/python-httpx.spec index 41c041b..5917845 100644 --- a/python-httpx.spec +++ b/python-httpx.spec @@ -25,6 +25,12 @@ %bcond_with test %endif +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %{?sle15_python_module_pythons} Name: python-httpx%{psuffix} Version: 0.27.2 @@ -50,8 +56,13 @@ Recommends: python-Pygments >= 2 Recommends: python-click >= 8 Recommends: python-h2 >= 3.0 Recommends: python-rich >= 10 +%if %{with libalternatives} +Requires: alts +BuildRequires: alts +%else Requires(post): update-alternatives Requires(postun): update-alternatives +%endif BuildArch: noarch # SECTION test requirements %if %{with test} @@ -99,6 +110,10 @@ donttest="$donttest or socks" %pytest -vv -k "not ($donttest)" --asyncio-mode=strict %endif +%pre +# If libalternatives is used: Removing old update-alternatives entries. +%python_libalternatives_reset_alternative httpx + %post %python_install_alternative httpx