Merge remote-tracking branch 'origin/slfo-main' into CVE-2025-64076

python-cbor2.changes

@@ -6,6 +6,16 @@ Wed Nov 19 10:56:07 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
   calculation
   (bsc#1253746, CVE-2025-64076, gh#agronholm/cbor2#265)
 
+-------------------------------------------------------------------
+Tue Aug 12 08:01:01 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Make the libalternatives transition conditional
+
+-------------------------------------------------------------------
+Wed Jun 25 11:44:28 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives
+
 -------------------------------------------------------------------
 Tue Oct 22 13:48:00 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
@@ -24,7 +34,7 @@ Thu Jun  6 10:36:17 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.c
 -------------------------------------------------------------------
 Wed Jun  5 15:47:30 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
-- Update to 5.6.3
+- Update to 5.6.3 (bsc#1220096, CVE-2024-26134):
   * Fixed decoding of epoch-based dates being affected by the local
     time zone in the C extension
 - from version 5.6.2

python-cbor2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-cbor2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,11 @@
 #
 
 
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
 %{?sle15_python_module_pythons}
 Name:           python-cbor2
 Version:        5.6.5
@@ -35,8 +40,13 @@ BuildRequires:  %{python_module setuptools_scm >= 6.4}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+%if %{with libalternatives}
+BuildRequires:  alts
+Requires:       alts
+%else
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
+%endif
 %python_subpackages
 
 %description
@@ -62,6 +72,9 @@ export LANG=en_US.UTF8
 export LANG=en_US.UTF8
 %pytest_arch
 
+%pre
+%python_libalternatives_reset_alternative cbor2
+
 %post
 %python_install_alternative cbor2