From 290727fe79b0c82121a6be15f3e146cc917a8515 Mon Sep 17 00:00:00 2001
From: Marina Latini <marina.latini@suse.com>
Date: Thu, 2 Nov 2023 14:59:47 +0100
Subject: [PATCH] Use the new apache2-mod_wsgi package name

---
 ...-backend.changes.deneb-alpha.fix-wsgi-requires |  1 +
 python/spacewalk/spacewalk-backend.spec           |  4 ++--
 ...es.deneb-alpha.fix-wsgi-requires_tftpsync-recv |  2 ++
 .../susemanager-tftpsync-recv.spec                | 15 ++-------------
 4 files changed, 7 insertions(+), 15 deletions(-)
 create mode 100644 python/spacewalk/spacewalk-backend.changes.deneb-alpha.fix-wsgi-requires
 create mode 100644 tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.deneb-alpha.fix-wsgi-requires_tftpsync-recv

diff --git a/python/spacewalk/spacewalk-backend.changes.deneb-alpha.fix-wsgi-requires b/python/spacewalk/spacewalk-backend.changes.deneb-alpha.fix-wsgi-requires
new file mode 100644
index 000000000000..3ad9e1275a73
--- /dev/null
+++ b/python/spacewalk/spacewalk-backend.changes.deneb-alpha.fix-wsgi-requires
@@ -0,0 +1 @@
+- Use the new apache2-mod_wsgi package name
diff --git a/python/spacewalk/spacewalk-backend.spec b/python/spacewalk/spacewalk-backend.spec
index 5b3c1fd6260f..d6b7a9718a67 100644
--- a/python/spacewalk/spacewalk-backend.spec
+++ b/python/spacewalk/spacewalk-backend.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package spacewalk-backend
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2008-2018 Red Hat, Inc.
 #
 # All modifications and additions to the file contributed by third parties
@@ -116,7 +116,7 @@ Group:          System/Management
 Requires(pre):  %{name}-sql = %{version}-%{release}
 Requires:       %{name}-sql = %{version}-%{release}
 Requires:       spacewalk-config
-Requires:       (apache2-mod_wsgi-python3 or python3-mod_wsgi)
+Requires:       (apache2-mod_wsgi or python3-mod_wsgi)
 Requires:       (python3-pam or python3-python-pam)
 
 # cobbler-web is known to break our configuration
diff --git a/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.deneb-alpha.fix-wsgi-requires_tftpsync-recv b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.deneb-alpha.fix-wsgi-requires_tftpsync-recv
new file mode 100644
index 000000000000..739b0a715293
--- /dev/null
+++ b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.changes.deneb-alpha.fix-wsgi-requires_tftpsync-recv
@@ -0,0 +1,2 @@
+- Use the new apache2-mod_wsgi package name
+- Build with Python 3 and clean up references to Python 2
diff --git a/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec
index c8c13ad36377..640bf98a7de5 100644
--- a/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec
+++ b/tftpsync/susemanager-tftpsync-recv/susemanager-tftpsync-recv.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package susemanager-tftpsync-recv
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,6 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
-%if 0%{?suse_version} > 1320 || 0%{?rhel}
-# SLE15 builds on Python 3
-%global build_py3   1
-%endif
-
 Name:           susemanager-tftpsync-recv
 Version:        4.4.1
 Release:        1
@@ -37,13 +31,8 @@ Requires(pre):  apache2
 Requires(pre):  httpd
 %endif
 Requires(pre):  tftp
-%if 0%{?build_py3}
 Requires:       python3
-Requires:       (apache2-mod_wsgi-python3 or python3-mod_wsgi)
-%else
-Requires:       apache2-mod_wsgi
-Requires:       python
-%endif
+Requires:       (apache2-mod_wsgi or python3-mod_wsgi)
 Requires:       spacewalk-backend
 Requires:       spacewalk-proxy-common
 Requires(pre):  coreutils