Sync changes to SLFO-1.2 branch

0001-man-document-static-ip-setup-differences-to-dracut-n.patch

@@ -33,3 +33,4 @@ index 312edff2ee..c4ea8baf8f 100644
          order in which they are announced by udev. If multiple
 -- 
 2.49.0
+

NetworkManager-1.52.1.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9caf947ce9353ab0733dd4a67d7523b495d9704f2144ee7f3de53cac9b84c359
-size 65311246

NetworkManager.changes

@@ -1,29 +1,9 @@
--------------------------------------------------------------------
-Thu Aug  7 19:17:10 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 1.52.1:
-  + Fail early if we cannot get current FEC (Forward Error
-    Correction) value.
-  + Allow reapplying ovs-bridge and ovs-port properties.
-  + When activating a WireGuard connection to an IPv6 endpoint, now
-    NetworkManager creates firewall rules to ensure that the
-    incoming packets are not dropped by kernel reverse path
-    filtering.
-
 -------------------------------------------------------------------
 Wed Jun 11 06:59:12 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
 
 - document static ip setup on boot (bsc#1244072)
   add 0001-man-document-static-ip-setup-differences-to-dracut-n.patch
 
--------------------------------------------------------------------
-Mon May 26 09:15:36 UTC 2025 - Callum Farmer <gmbr3@opensuse.org>
-
-- Stop relying on the UsrMerge symlinks and ensure we look directly
-  in /usr:
-  + Use _firmwaredir for kernel_firmware_dir
-  + Use /usr/sbin/modprobe (was /sbin/modprobe)
-
 -------------------------------------------------------------------
 Wed Apr  9 02:42:56 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
 

NetworkManager.obsinfo

@@ -1,4 +1,4 @@
 name: NetworkManager
-version: 1.52.1
+version: 1.52.0
-mtime: 1751970112
+mtime: 1740750933
-commit: 826e37b175368a9ce761a575adec520b83958742
+commit: 995a28fa1ccc54ad22e794294c3c6783cc3f30ed

NetworkManager.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package NetworkManager
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# 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
@@ -64,7 +64,7 @@
 %endif
 
 Name:           NetworkManager
-Version:        1.52.1
+Version:        1.52.0
 Release:        0
 Summary:        Standard Linux network configuration tool suite
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -97,7 +97,7 @@ Patch8:         python3.6-in-sle.patch
 Patch9:         NetworkManager-dont-renew-bridge-dhcp-if-no-mac-on-wakeup.patch
 # PATCH-FIX-UPSTREAM
 Patch10:        https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2069.patch
-# PATCH-FIX-OPENSUSE nm-initrd-generator document static ip setup bsc#1244072
+# PATCH-FIX-SLE nm-initrd-generator document static ip setup bsc#1244072
 Patch11:        0001-man-document-static-ip-setup-differences-to-dracut-n.patch
 
 BuildRequires:  c++_compiler
@@ -339,8 +339,6 @@ export PYTHON=%{_bindir}/python3
     -Dudev_dir=%{_udevdir} \
     -Ddbus_conf_dir=%{_dbusconfdir} \
     -Ddnsmasq=%{_sbindir}/dnsmasq \
-    -Dmodprobe=%{_sbindir}/modprobe \
-    -Dkernel_firmware_dir=%{_firmwaredir} \
     -Ddist_version=%{version} \
     -Dpolkit_agent_helper_1=%{_libexecdir}/polkit-1/polkit-agent-helper-1 \
     -Dlibaudit=%{libaudit_meson_opt} \

_service

@@ -3,7 +3,7 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git</param>
-    <param name="revision">1.52.1</param>
+    <param name="revision">1.52.0</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>