Sync from SUSE:SLFO:Main python-azure-agent revision 7679e65eab582269dbe2c6f5066c6e9f

paa_force_py3_sle15.patch

@@ -0,0 +1,8 @@
+--- bin/waagent.orig
++++ bin/waagent
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #
+ # Azure Linux Agent
+ #

python-azure-agent.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Jun 19 08:06:14 UTC 2025 - Joachim Gleissner <jgleissner@suse.com>
+
+- Set AutoUpdate.UpdateToLatestVersion=n in /etc/waagent.conf
+  (bsc#1244933)
+
+-------------------------------------------------------------------
+Tue Apr 15 10:02:16 UTC 2025 - Joachim Gleissner <jgleissner@suse.com>
+
+- Fix %suse_version conditional in spec file so package is built
+  using python2 in SLE 12 (bsc#1240385)
+
+-------------------------------------------------------------------
+Thu Feb 20 21:16:37 UTC 2025 - Robert Schweikert <rjschwei@suse.com>
+
+- Add a new version of paa_force_py3_sle15.patch to compensate for
+  missing Python RPM macros in older distros
+
 -------------------------------------------------------------------
 Mon Dec 23 10:54:55 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
 

python-azure-agent.spec

@@ -18,11 +18,13 @@
 
 %if 0%{?suse_version} >= 1600
 %define pythons %{primary_python}
-%elif 0%{?suse_version} = 1315
+%else
+%if 0%{?suse_version} == 1315
 %define pythons python
 %else
 %define pythons python3
 %endif
+%endif
 %global _sitelibdir %{%{pythons}_sitelib}
 
 Name:           python-azure-agent
@@ -33,6 +35,8 @@ License:        Apache-2.0
 Group:          System/Daemons
 URL:            https://github.com/Azure/WALinuxAgent
 Source0:        WALinuxAgent-%{version}.tar.gz
+# Drop in 2034 when SLE 15 reaches EOL
+Patch6:         paa_force_py3_sle15.patch
 Patch7:         reset-dhcp-deprovision.patch
 Patch8:         paa_12_sp5_rdma_no_ext_driver.patch
 # PATCH-FIX-UPSTREAM gh#Azure/WALinuxAgent#2741
@@ -44,7 +48,11 @@ BuildRequires:  dos2unix
 
 BuildRequires:  %{pythons}-pip
 BuildRequires:  %{pythons}-setuptools
+# azure-agent is maintained in SLE 12 codestream but wheel in 12-SP1 one
+# disable this BuildRequires as work-around in 12 GA
+%if 0%{?sle_version} >= 120100
 BuildRequires:  %{pythons}-wheel
+%endif
 BuildRequires:  distribution-release
 BuildRequires:  openssl
 BuildRequires:  python-rpm-macros
@@ -147,6 +155,9 @@ setup
 
 %prep
 %setup -q -n WALinuxAgent-%{version}
+%if 0%{?suse_version} > 1315 && 0%{?suse_version} <= 1600
+%patch -P 6
+%endif
 %patch -P 7
 %patch -P 8 -p1
 %patch -P 9 -p1
@@ -154,7 +165,7 @@ setup
 %patch -P 12
 
 %build
-# We have an insane veriation in the way we identify our distros from suse,
+# We have an insane veriation in the way we identify our distros from SUSE,
 # sles, opensuse, openSUSE Tumbleweed and who knows what else. This makes it
 # for all intend and purposes impractical to follow the bouncing ball and keep
 # updating the upstream detection code. We use setup.py to be able to
@@ -165,13 +176,15 @@ setup
 %python_exec setup.py install --prefix=%{_prefix} --lnx-distro='suse' --root=%{buildroot}
 %if 0%{?suse_version} > 1315
 rm %{buildroot}%{_sbindir}/waagent2.0
+%endif
+%if 0%{?suse_version} >= 1600
 %python3_fix_shebang
 %endif
 
 # Config file flavor setup
 cp %{buildroot}%{_sysconfdir}/waagent.conf %{buildroot}%{_sysconfdir}/waagent.conf.default
 # No autoupdate of binaries for any SUSE product
-sed -i -e "s/# AutoUpdate.Enabled=y/AutoUpdate.Enabled=n/" %{buildroot}%{_sysconfdir}/waagent.conf
+sed -i -e "s/# AutoUpdate.UpdateToLatestVersion=y/AutoUpdate.UpdateToLatestVersion=n/" %{buildroot}%{_sysconfdir}/waagent.conf
 # Common settings for most SUSE products
 # Generate all supported SSH host key types
 sed -i -e "s/SshHostKeyPairType=rsa/SshHostKeyPairType=auto/" %{buildroot}%{_sysconfdir}/waagent.conf