File project.diff of Package salt

--- salt.spec.orig
+++ salt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package salt
 #
-# 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
@@ -589,6 +589,10 @@ Patch184:       use-versioned-python-int
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END
 
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1252285
+Patch200:       0001-Remove-uses-of-spwd.patch
+Patch201:       0002-Replace-spwd-in-linux_shadow-tests.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  logrotate
 %if 0%{?suse_version} > 1020
@@ -609,8 +613,8 @@ Obsoletes:      python3-%{name}
 
 Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
-Provides:       user(salt)
 Provides:       group(salt)
+Provides:       user(salt)
 
 %if 0%{?suse_version}
 Requires(pre):  shadow
@@ -673,6 +677,7 @@ servers, handle them quickly and through
 %if 0%{?singlespec_compat}
 %package -n python3-salt
 %else
+
 %package -n python-salt
 %endif
 Summary:        python3 library for salt
@@ -704,12 +709,12 @@ BuildRequires:  %{python_module pycrypto
 %endif
 %endif
 BuildRequires:  %{python_module PyYAML}
-BuildRequires:  %{python_module psutil}
-BuildRequires:  %{python_module requests >= 1.0.0}
+BuildRequires:  %{python_module contextvars}
 BuildRequires:  %{python_module distro}
 BuildRequires:  %{python_module looseversion}
 BuildRequires:  %{python_module packaging}
-BuildRequires:  %{python_module contextvars}
+BuildRequires:  %{python_module psutil}
+BuildRequires:  %{python_module requests >= 1.0.0}
 
 # requirements/zeromq.txt
 %if %{with test}
@@ -740,7 +745,7 @@ Requires:       alts
 BuildRequires:  alts
 %else
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 %endif
 %endif
 
@@ -782,12 +787,12 @@ Requires:       python-pyzmq >= 2.2.0
 %if 0%{?singlespec_compat}
 Recommends:     %{python_module jmespath}
 Requires:       %{python_module PyYAML}
-Requires:       %{python_module psutil}
-Requires:       %{python_module requests >= 1.0.0}
+Requires:       %{python_module contextvars}
 Requires:       %{python_module distro}
 Requires:       %{python_module looseversion}
 Requires:       %{python_module packaging}
-Requires:       %{python_module contextvars}
+Requires:       %{python_module psutil}
+Requires:       %{python_module requests >= 1.0.0}
 %if 0%{?suse_version}
 # required for zypper.py
 Requires:       %{python_module rpm}
@@ -799,12 +804,12 @@ Suggests:       %{python_module gnupg}
 %else
 Recommends:     python-jmespath
 Requires:       python-PyYAML
-Requires:       python-psutil
-Requires:       python-requests >= 1.0.0
+Requires:       python-contextvars
 Requires:       python-distro
 Requires:       python-looseversion
 Requires:       python-packaging
-Requires:       python-contextvars
+Requires:       python-psutil
+Requires:       python-requests >= 1.0.0
 %if 0%{?suse_version}
 # required for zypper.py
 Requires:       python-rpm
@@ -836,8 +841,8 @@ Requires(pre):  libzypp(plugin:system) >
 
 # Required by Salt modules
 Requires:       iputils
-Requires:       sudo
 Requires:       file
+Requires:       sudo
 Recommends:     man
 %if 0%{?singlespec_compat}
 Recommends:     %{python_module passlib}
@@ -856,6 +861,7 @@ Provides:       %{name}-call = %{version
 %if 0%{?singlespec_compat}
 %description -n python3-salt
 %else
+
 %description -n python-salt
 %endif
 Python3 specific files for salt
@@ -1076,6 +1082,7 @@ list of active executors.  This package
 %if 0%{?singlespec_compat}
 %package -n python3-salt-testsuite
 %else
+
 %package -n python-salt-testsuite
 %endif
 Summary:        Unit and integration tests for Salt
@@ -1100,6 +1107,7 @@ Requires:       %{python_module docker}
 %if 0%{?suse_version} < 1600
 Requires:       %{python_module mock}
 %endif
+Requires:       %{python_module pip}
 Requires:       %{python_module pygit2}
 Requires:       %{python_module pytest >= 7.0.1}
 Requires:       %{python_module pytest-httpserver}
@@ -1107,7 +1115,6 @@ Requires:       %{python_module pytest-s
 Requires:       %{python_module pytest-subtests}
 Requires:       %{python_module testinfra}
 Requires:       %{python_module yamllint}
-Requires:       %{python_module pip}
 %else
 Requires:       python-CherryPy
 Requires:       python-Genshi
@@ -1120,6 +1127,7 @@ Requires:       python-docker
 %if 0%{?suse_version} < 1600
 Requires:       python-mock
 %endif
+Requires:       python-pip
 Requires:       python-pygit2
 Requires:       python-pytest >= 7.0.1
 Requires:       python-pytest-httpserver
@@ -1127,17 +1135,17 @@ Requires:       python-pytest-salt-facto
 Requires:       python-pytest-subtests
 Requires:       python-testinfra
 Requires:       python-yamllint
-Requires:       python-pip
 %endif
 Requires:       docker
-Requires:       openssh
 Requires:       git
+Requires:       openssh
 
 Obsoletes:      %{name}-tests
 
 %if 0%{?singlespec_compat}
 %description -n python3-salt-testsuite
 %else
+
 %description -n python-salt-testsuite
 %endif
 Collection of unit, functional, and integration tests for %{name}.
@@ -1151,6 +1159,9 @@ cp %{S:5} ./.travis.yml
 cp %{S:6} .
 %autopatch -p1
 
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1252286
+sed -i 's/"apache2ctl"/"apachectl"/' salt/modules/suse_apache.py
+
 %build
 %if "%{flavor}" != "testsuite"
 
@@ -1635,6 +1646,7 @@ fi
 %if 0%{?singlespec_compat}
 %posttrans -n %{python_module salt}
 %else
+
 %posttrans -n python-salt
 %endif