Remove debug plugin (i.e. dnf debug-dump and and debug-restore commands)

Resolves: RHEL-23706

0003-build-Disable-debug-plugin-on-Fedora-40-and-RHEL-9.patch

@@ -0,0 +1,334 @@
+From 258ce716def8cf4e406da8eb4a80eace4865ac29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 14 Jun 2024 13:57:42 +0200
+Subject: [PATCH] build: Disable debug plugin on Fedora > 40 and RHEL > 9
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream commit: 918a17c540e69bd227a0534d3838c780341c600a
+Upstream commit: 0ea22cfbd572d6ca188c6eac73d86287d1ceb17d
+
+This adds -DWITHOUT_DEBUG:str=1 CMake option to disable installing
+debug plugin (i.e. debug-dump and debug-restore).
+
+The plugin is unhelp and broken.
+
+https://issues.redhat.com/browse/RHEL-23706
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ CMakeLists.txt         |  4 ++++
+ README.rst             |  8 +++++++
+ dnf-plugins-core.spec  | 50 +++++++++++++++++++++++++++++++++++++-----
+ doc/CMakeLists.txt     | 14 +++++++++---
+ plugins/CMakeLists.txt |  2 ++
+ 5 files changed, 69 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1eea7b..a54e2c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,10 @@
+ PROJECT (dnf-plugins-core NONE)
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.4)
+ 
++if (NOT WITHOUT_DEBUG)
++    set (WITHOUT_DEBUG "0")
++endif()
++
+ if (NOT WITHOUT_LOCAL)
+     set (WITHOUT_LOCAL "0")
+ endif()
+diff --git a/README.rst b/README.rst
+index 031c013..321abfe 100644
+--- a/README.rst
++++ b/README.rst
+@@ -26,6 +26,14 @@ From the DNF git checkout directory::
+     cmake .. && make;
+     popd;
+ 
++CMake optional switches::
++
++    -DWITHOUT_LOCAL:str=1
++        Differnt string value than "0" disables installing a local plugin.
++
++    -DWITHOUT_DEBUG:str=1
++        Differnt string value than "0" disables installing a debug plugin.
++
+ Then to run DNF::
+ 
+     PYTHONPATH=`readlink -f .` bin/dnf <arguments>
+diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
+index 969233b..a2fe33f 100644
+--- a/dnf-plugins-core.spec
++++ b/dnf-plugins-core.spec
+@@ -10,6 +10,12 @@
+ 
+ %bcond dnf5_obsoletes_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 11]
+ 
++%if (0%{?fedora} && 0%{?fedora} >= 41) || (0%{?rhel} && 0%{?rhel} >= 10)
++%bcond_with debug_plugin
++%else
++%bcond_without debug_plugin
++%endif
++
+ %if 0%{?rhel} && 0%{?rhel} <= 7
+ %bcond_with python3
+ %else
+@@ -56,8 +62,10 @@ Provides:       dnf-command(builddep)
+ Provides:       dnf-command(changelog)
+ Provides:       dnf-command(config-manager)
+ Provides:       dnf-command(copr)
++%if %{with debug_plugin}
+ Provides:       dnf-command(debug-dump)
+ Provides:       dnf-command(debug-restore)
++%endif
+ Provides:       dnf-command(debuginfo-install)
+ Provides:       dnf-command(download)
+ Provides:       dnf-command(groups-manager)
+@@ -69,7 +77,9 @@ Provides:       dnf-command(repodiff)
+ Provides:       dnf-command(system-upgrade)
+ Provides:       dnf-command(offline-upgrade)
+ Provides:       dnf-command(offline-distrosync)
++%if %{with debug_plugin}
+ Provides:       dnf-plugins-extras-debug = %{version}-%{release}
++%endif
+ Provides:       dnf-plugins-extras-repoclosure = %{version}-%{release}
+ Provides:       dnf-plugins-extras-repograph = %{version}-%{release}
+ Provides:       dnf-plugins-extras-repomanage = %{version}-%{release}
+@@ -95,7 +105,7 @@ Conflicts:      dnf-plugins-extras-common-data < %{dnf_plugins_extra}
+ 
+ %description
+ Core Plugins for DNF. This package enhances DNF with builddep, config-manager,
+-copr, debug, debuginfo-install, download, needs-restarting, groups-manager, repoclosure,
++copr, %{?with_debug_plugin:debug, }debuginfo-install, download, needs-restarting, groups-manager, repoclosure,
+ repograph, repomanage, reposync, changelog and repodiff commands. Additionally
+ provides generate_completion_cache passive plugin.
+ 
+@@ -122,11 +132,15 @@ Requires:       python-dateutil
+ Requires:       python2-dbus
+ Requires:       python2-dateutil
+ %endif
++%if %{with debug_plugin}
+ Provides:       python2-dnf-plugins-extras-debug = %{version}-%{release}
++%endif
+ Provides:       python2-dnf-plugins-extras-repoclosure = %{version}-%{release}
+ Provides:       python2-dnf-plugins-extras-repograph = %{version}-%{release}
+ Provides:       python2-dnf-plugins-extras-repomanage = %{version}-%{release}
++%if %{with debug_plugin}
+ Obsoletes:      python2-dnf-plugins-extras-debug < %{dnf_plugins_extra}
++%endif
+ Obsoletes:      python2-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra}
+ Obsoletes:      python2-dnf-plugins-extras-repograph < %{dnf_plugins_extra}
+ Obsoletes:      python2-dnf-plugins-extras-repomanage < %{dnf_plugins_extra}
+@@ -138,7 +152,7 @@ Conflicts:      python-%{name} < %{version}-%{release}
+ 
+ %description -n python2-%{name}
+ Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep,
+-config-manager, copr, degug, debuginfo-install, download, needs-restarting,
++config-manager, copr, %{?with_debug_plugin:debug, }debuginfo-install, download, needs-restarting,
+ groups-manager, repoclosure, repograph, repomanage, reposync, changelog,
+ repodiff, system-upgrade, offline-upgrade and offline-distrosync commands.
+ Additionally provides generate_completion_cache passive plugin.
+@@ -163,12 +177,16 @@ Requires:       python3-dnf >= %{dnf_lowest_compatible}
+ Requires:       python3-hawkey >= %{hawkey_version}
+ Requires:       python3-dateutil
+ Requires:       python3-systemd
++%if %{with debug_plugin}
+ Provides:       python3-dnf-plugins-extras-debug = %{version}-%{release}
++%endif
+ Provides:       python3-dnf-plugins-extras-repoclosure = %{version}-%{release}
+ Provides:       python3-dnf-plugins-extras-repograph = %{version}-%{release}
+ Provides:       python3-dnf-plugins-extras-repomanage = %{version}-%{release}
+ Provides:       python3-dnf-plugin-system-upgrade = %{version}-%{release}
++%if %{with debug_plugin}
+ Obsoletes:      python3-dnf-plugins-extras-debug < %{dnf_plugins_extra}
++%endif
+ Obsoletes:      python3-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra}
+ Obsoletes:      python3-dnf-plugins-extras-repograph < %{dnf_plugins_extra}
+ Obsoletes:      python3-dnf-plugins-extras-repomanage < %{dnf_plugins_extra}
+@@ -181,7 +199,7 @@ Conflicts:      python-%{name} < %{version}-%{release}
+ 
+ %description -n python3-%{name}
+ Core Plugins for DNF, Python 3 interface. This package enhances DNF with builddep,
+-config-manager, copr, debug, debuginfo-install, download, needs-restarting,
++config-manager, copr, %{?with_debug_plugin:debug, }debuginfo-install, download, needs-restarting,
+ groups-manager, repoclosure, repograph, repomanage, reposync, changelog,
+ repodiff, system-upgrade, offline-upgrade and offline-distrosync commands.
+ Additionally provides generate_completion_cache passive plugin.
+@@ -209,7 +227,7 @@ Summary:        Yum-utils CLI compatibility layer
+ %description -n %{yum_utils_subpackage_name}
+ As a Yum-utils CLI compatibility layer, supplies in CLI shims for
+ debuginfo-install, repograph, package-cleanup, repoclosure, repomanage,
+-repoquery, reposync, repotrack, repodiff, builddep, config-manager, debug,
++repoquery, reposync, repotrack, repodiff, builddep, config-manager,%{?with_debug_plugin: debug,}
+ download and yum-groups-manager that use new implementations using DNF.
+ %endif
+ 
+@@ -467,14 +485,18 @@ mkdir build-py3
+ %build
+ %if %{with python2}
+ pushd build-py2
+-  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITHOUT_LOCAL:str=0%{?rhel}
++  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python2} \
++    -DWITHOUT_DEBUG:str=0%{!?with_debug_plugin:1} \
++    -DWITHOUT_LOCAL:str=0%{?rhel}
+   %make_build
+   make doc-man
+ popd
+ %endif
+ %if %{with python3}
+ pushd build-py3
+-  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITHOUT_LOCAL:str=0%{?rhel}
++  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python3} \
++    -DWITHOUT_DEBUG:str=0%{!?with_debug_plugin:1} \
++    -DWITHOUT_LOCAL:str=0%{?rhel}
+   %make_build
+   make doc-man
+ popd
+@@ -535,8 +557,10 @@ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
+++%if %{with debug_plugin}
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
+++%endif
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-groups-manager
+ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
+ # These commands don't have a dedicated man page, so let's just point them
+@@ -563,7 +587,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %{_mandir}/man8/dnf*-changelog.*
+ %{_mandir}/man8/dnf*-config-manager.*
+ %{_mandir}/man8/dnf*-copr.*
++%if %{with debug_plugin}
+ %{_mandir}/man8/dnf*-debug.*
++%endif
+ %{_mandir}/man8/dnf*-debuginfo-install.*
+ %{_mandir}/man8/dnf*-download.*
+ %{_mandir}/man8/dnf*-generate_completion_cache.*
+@@ -597,7 +623,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %{python2_sitelib}/dnf-plugins/changelog.*
+ %{python2_sitelib}/dnf-plugins/config_manager.*
+ %{python2_sitelib}/dnf-plugins/copr.*
++%if %{with debug_plugin}
+ %{python2_sitelib}/dnf-plugins/debug.*
++%endif
+ %{python2_sitelib}/dnf-plugins/debuginfo-install.*
+ %{python2_sitelib}/dnf-plugins/download.*
+ %{python2_sitelib}/dnf-plugins/generate_completion_cache.*
+@@ -623,7 +651,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %{python3_sitelib}/dnf-plugins/changelog.py
+ %{python3_sitelib}/dnf-plugins/config_manager.py
+ %{python3_sitelib}/dnf-plugins/copr.py
++%if %{with debug_plugin}
+ %{python3_sitelib}/dnf-plugins/debug.py
++%endif
+ %{python3_sitelib}/dnf-plugins/debuginfo-install.py
+ %{python3_sitelib}/dnf-plugins/download.py
+ %{python3_sitelib}/dnf-plugins/generate_completion_cache.py
+@@ -639,7 +669,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %{python3_sitelib}/dnf-plugins/__pycache__/changelog.*
+ %{python3_sitelib}/dnf-plugins/__pycache__/config_manager.*
+ %{python3_sitelib}/dnf-plugins/__pycache__/copr.*
++%if %{with debug_plugin}
+ %{python3_sitelib}/dnf-plugins/__pycache__/debug.*
++%endif
+ %{python3_sitelib}/dnf-plugins/__pycache__/debuginfo-install.*
+ %{python3_sitelib}/dnf-plugins/__pycache__/download.*
+ %{python3_sitelib}/dnf-plugins/__pycache__/generate_completion_cache.*
+@@ -673,8 +705,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %{_bindir}/repotrack
+ %{_bindir}/yum-builddep
+ %{_bindir}/yum-config-manager
++%if %{with debug_plugin}
+ %{_bindir}/yum-debug-dump
+ %{_bindir}/yum-debug-restore
++%endif
+ %{_bindir}/yum-groups-manager
+ %{_bindir}/yumdownloader
+ %{_mandir}/man1/debuginfo-install.*
+@@ -686,8 +720,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %{_mandir}/man1/reposync.*
+ %{_mandir}/man1/yum-builddep.*
+ %{_mandir}/man1/yum-config-manager.*
++%if %{with debug_plugin}
+ %{_mandir}/man1/yum-debug-dump.*
+ %{_mandir}/man1/yum-debug-restore.*
++%endif
+ %{_mandir}/man1/yum-groups-manager.*
+ %{_mandir}/man1/yumdownloader.*
+ %{_mandir}/man1/package-cleanup.*
+@@ -708,8 +744,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
+ %exclude %{_mandir}/man1/reposync.*
+ %exclude %{_mandir}/man1/yum-builddep.*
+ %exclude %{_mandir}/man1/yum-config-manager.*
++%if %{with debug_plugin}
+ %exclude %{_mandir}/man1/yum-debug-dump.*
+ %exclude %{_mandir}/man1/yum-debug-restore.*
++%endif
+ %exclude %{_mandir}/man1/yum-groups-manager.*
+ %exclude %{_mandir}/man1/yumdownloader.*
+ %exclude %{_mandir}/man1/package-cleanup.*
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 9fd3f7c..143a26c 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -22,7 +22,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf4-builddep.8
+     ${CMAKE_CURRENT_BINARY_DIR}/dnf4-changelog.8
+     ${CMAKE_CURRENT_BINARY_DIR}/dnf4-config-manager.8
+     ${CMAKE_CURRENT_BINARY_DIR}/dnf4-copr.8
+-    ${CMAKE_CURRENT_BINARY_DIR}/dnf4-debug.8
+     ${CMAKE_CURRENT_BINARY_DIR}/dnf4-debuginfo-install.8
+     ${CMAKE_CURRENT_BINARY_DIR}/dnf4-download.8
+     ${CMAKE_CURRENT_BINARY_DIR}/dnf4-generate_completion_cache.8
+@@ -48,6 +47,11 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf-migrate.8
+         DESTINATION share/man/man8)
+ endif()
+ 
++if (${WITHOUT_DEBUG} STREQUAL "0")
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf4-debug.8
++	DESTINATION share/man/man8)
++endif()
++
+ if (${WITHOUT_LOCAL} STREQUAL "0")
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf4-local.8
+ 	DESTINATION share/man/man8)
+@@ -63,8 +67,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/debuginfo-install.1
+     ${CMAKE_CURRENT_BINARY_DIR}/yum-builddep.1
+     ${CMAKE_CURRENT_BINARY_DIR}/yum-changelog.1
+     ${CMAKE_CURRENT_BINARY_DIR}/yum-config-manager.1
+-    ${CMAKE_CURRENT_BINARY_DIR}/yum-debug-dump.1
+-    ${CMAKE_CURRENT_BINARY_DIR}/yum-debug-restore.1
+     ${CMAKE_CURRENT_BINARY_DIR}/yum-groups-manager.1
+     ${CMAKE_CURRENT_BINARY_DIR}/yumdownloader.1
+     ${CMAKE_CURRENT_BINARY_DIR}/package-cleanup.1
+@@ -72,6 +74,12 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/debuginfo-install.1
+     ${CMAKE_CURRENT_BINARY_DIR}/yum-utils.1
+ 	DESTINATION share/man/man1)
+ 
++if (${WITHOUT_DEBUG} STREQUAL "0")
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/yum-debug-dump.1
++    ${CMAKE_CURRENT_BINARY_DIR}/yum-debug-restore.1
++	DESTINATION share/man/man1)
++endif()
++
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/yum-versionlock.conf.5
+ 	DESTINATION share/man/man5)
+ 
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index 6f4fa6e..d2383a5 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ INSTALL (FILES builddep.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
+ INSTALL (FILES changelog.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
++if (${WITHOUT_DEBUG} STREQUAL "0")
+ INSTALL (FILES debug.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
++endif()
+ INSTALL (FILES debuginfo-install.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
+ INSTALL (FILES config_manager.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
+ INSTALL (FILES copr.py DESTINATION ${PYTHON_INSTALL_DIR}/dnf-plugins)
+-- 
+2.45.2
+

0004-s-Differnt-Different.patch

@@ -0,0 +1,33 @@
+From f0c08b4cae724057dc1183efacec45cb9032f1aa Mon Sep 17 00:00:00 2001
+From: Evan Goode <mail@evangoo.de>
+Date: Tue, 18 Jun 2024 16:53:34 -0400
+Subject: [PATCH] s/Differnt/Different
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ README.rst | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/README.rst b/README.rst
+index 321abfe..47410b2 100644
+--- a/README.rst
++++ b/README.rst
+@@ -29,10 +29,10 @@ From the DNF git checkout directory::
+ CMake optional switches::
+ 
+     -DWITHOUT_LOCAL:str=1
+-        Differnt string value than "0" disables installing a local plugin.
++        Different string value than "0" disables installing a local plugin.
+ 
+     -DWITHOUT_DEBUG:str=1
+-        Differnt string value than "0" disables installing a debug plugin.
++        Different string value than "0" disables installing a debug plugin.
+ 
+ Then to run DNF::
+ 
+-- 
+2.45.2
+

dnf-plugins-core.spec

@@ -10,6 +10,12 @@
 
 %bcond dnf5_obsoletes_dnf %[0%{?fedora} > 40 || 0%{?rhel} > 11]
 
+%if (0%{?fedora} && 0%{?fedora} >= 41) || (0%{?rhel} && 0%{?rhel} >= 10)
+%bcond_with debug_plugin
+%else
+%bcond_without debug_plugin
+%endif
+
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %bcond_with python3
 %else
@@ -36,13 +42,15 @@
 
 Name:           dnf-plugins-core
 Version:        4.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Core Plugins for DNF
 License:        GPL-2.0-or-later
 URL:            https://github.com/rpm-software-management/dnf-plugins-core
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch1:         0001-needs-restarting-Revert-using-systemd-start-time.patch
 Patch2:         0002-spec-Fix-symbolic-links-to-packaged-files.patch
+Patch3:         0003-build-Disable-debug-plugin-on-Fedora-40-and-RHEL-9.patch
+Patch4:         0004-s-Differnt-Different.patch
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -58,8 +66,10 @@ Provides:       dnf-command(builddep)
 Provides:       dnf-command(changelog)
 Provides:       dnf-command(config-manager)
 Provides:       dnf-command(copr)
+%if %{with debug_plugin}
 Provides:       dnf-command(debug-dump)
 Provides:       dnf-command(debug-restore)
+%endif
 Provides:       dnf-command(debuginfo-install)
 Provides:       dnf-command(download)
 Provides:       dnf-command(groups-manager)
@@ -71,7 +81,9 @@ Provides:       dnf-command(repodiff)
 Provides:       dnf-command(system-upgrade)
 Provides:       dnf-command(offline-upgrade)
 Provides:       dnf-command(offline-distrosync)
+%if %{with debug_plugin}
 Provides:       dnf-plugins-extras-debug = %{version}-%{release}
+%endif
 Provides:       dnf-plugins-extras-repoclosure = %{version}-%{release}
 Provides:       dnf-plugins-extras-repograph = %{version}-%{release}
 Provides:       dnf-plugins-extras-repomanage = %{version}-%{release}
@@ -97,7 +109,7 @@ Conflicts:      dnf-plugins-extras-common-data < %{dnf_plugins_extra}
 
 %description
 Core Plugins for DNF. This package enhances DNF with builddep, config-manager,
-copr, debug, debuginfo-install, download, needs-restarting, groups-manager, repoclosure,
+copr, %{?with_debug_plugin:debug, }debuginfo-install, download, needs-restarting, groups-manager, repoclosure,
 repograph, repomanage, reposync, changelog and repodiff commands. Additionally
 provides generate_completion_cache passive plugin.
 
@@ -124,11 +136,15 @@ Requires:       python-dateutil
 Requires:       python2-dbus
 Requires:       python2-dateutil
 %endif
+%if %{with debug_plugin}
 Provides:       python2-dnf-plugins-extras-debug = %{version}-%{release}
+%endif
 Provides:       python2-dnf-plugins-extras-repoclosure = %{version}-%{release}
 Provides:       python2-dnf-plugins-extras-repograph = %{version}-%{release}
 Provides:       python2-dnf-plugins-extras-repomanage = %{version}-%{release}
+%if %{with debug_plugin}
 Obsoletes:      python2-dnf-plugins-extras-debug < %{dnf_plugins_extra}
+%endif
 Obsoletes:      python2-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra}
 Obsoletes:      python2-dnf-plugins-extras-repograph < %{dnf_plugins_extra}
 Obsoletes:      python2-dnf-plugins-extras-repomanage < %{dnf_plugins_extra}
@@ -140,7 +156,7 @@ Conflicts:      python-%{name} < %{version}-%{release}
 
 %description -n python2-%{name}
 Core Plugins for DNF, Python 2 interface. This package enhances DNF with builddep,
-config-manager, copr, degug, debuginfo-install, download, needs-restarting,
+config-manager, copr, %{?with_debug_plugin:debug, }debuginfo-install, download, needs-restarting,
 groups-manager, repoclosure, repograph, repomanage, reposync, changelog,
 repodiff, system-upgrade, offline-upgrade and offline-distrosync commands.
 Additionally provides generate_completion_cache passive plugin.
@@ -165,12 +181,16 @@ Requires:       python3-dnf >= %{dnf_lowest_compatible}
 Requires:       python3-hawkey >= %{hawkey_version}
 Requires:       python3-dateutil
 Requires:       python3-systemd
+%if %{with debug_plugin}
 Provides:       python3-dnf-plugins-extras-debug = %{version}-%{release}
+%endif
 Provides:       python3-dnf-plugins-extras-repoclosure = %{version}-%{release}
 Provides:       python3-dnf-plugins-extras-repograph = %{version}-%{release}
 Provides:       python3-dnf-plugins-extras-repomanage = %{version}-%{release}
 Provides:       python3-dnf-plugin-system-upgrade = %{version}-%{release}
+%if %{with debug_plugin}
 Obsoletes:      python3-dnf-plugins-extras-debug < %{dnf_plugins_extra}
+%endif
 Obsoletes:      python3-dnf-plugins-extras-repoclosure < %{dnf_plugins_extra}
 Obsoletes:      python3-dnf-plugins-extras-repograph < %{dnf_plugins_extra}
 Obsoletes:      python3-dnf-plugins-extras-repomanage < %{dnf_plugins_extra}
@@ -183,7 +203,7 @@ Conflicts:      python-%{name} < %{version}-%{release}
 
 %description -n python3-%{name}
 Core Plugins for DNF, Python 3 interface. This package enhances DNF with builddep,
-config-manager, copr, debug, debuginfo-install, download, needs-restarting,
+config-manager, copr, %{?with_debug_plugin:debug, }debuginfo-install, download, needs-restarting,
 groups-manager, repoclosure, repograph, repomanage, reposync, changelog,
 repodiff, system-upgrade, offline-upgrade and offline-distrosync commands.
 Additionally provides generate_completion_cache passive plugin.
@@ -211,7 +231,7 @@ Summary:        Yum-utils CLI compatibility layer
 %description -n %{yum_utils_subpackage_name}
 As a Yum-utils CLI compatibility layer, supplies in CLI shims for
 debuginfo-install, repograph, package-cleanup, repoclosure, repomanage,
-repoquery, reposync, repotrack, repodiff, builddep, config-manager, debug,
+repoquery, reposync, repotrack, repodiff, builddep, config-manager,%{?with_debug_plugin: debug,}
 download and yum-groups-manager that use new implementations using DNF.
 %endif
 
@@ -469,14 +489,18 @@ mkdir build-py3
 %build
 %if %{with python2}
 pushd build-py2
-  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITHOUT_LOCAL:str=0%{?rhel}
+  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python2} \
+    -DWITHOUT_DEBUG:str=0%{!?with_debug_plugin:1} \
+    -DWITHOUT_LOCAL:str=0%{?rhel}
   %make_build
   make doc-man
 popd
 %endif
 %if %{with python3}
 pushd build-py3
-  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITHOUT_LOCAL:str=0%{?rhel}
+  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python3} \
+    -DWITHOUT_DEBUG:str=0%{!?with_debug_plugin:1} \
+    -DWITHOUT_LOCAL:str=0%{?rhel}
   %make_build
   make doc-man
 popd
@@ -537,8 +561,10 @@ ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
+%if %{with debug_plugin}
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
+%endif
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-groups-manager
 ln -srf %{buildroot}%{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
 # These commands don't have a dedicated man page, so let's just point them
@@ -565,7 +591,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %{_mandir}/man8/dnf*-changelog.*
 %{_mandir}/man8/dnf*-config-manager.*
 %{_mandir}/man8/dnf*-copr.*
+%if %{with debug_plugin}
 %{_mandir}/man8/dnf*-debug.*
+%endif
 %{_mandir}/man8/dnf*-debuginfo-install.*
 %{_mandir}/man8/dnf*-download.*
 %{_mandir}/man8/dnf*-generate_completion_cache.*
@@ -599,7 +627,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %{python2_sitelib}/dnf-plugins/changelog.*
 %{python2_sitelib}/dnf-plugins/config_manager.*
 %{python2_sitelib}/dnf-plugins/copr.*
+%if %{with debug_plugin}
 %{python2_sitelib}/dnf-plugins/debug.*
+%endif
 %{python2_sitelib}/dnf-plugins/debuginfo-install.*
 %{python2_sitelib}/dnf-plugins/download.*
 %{python2_sitelib}/dnf-plugins/generate_completion_cache.*
@@ -625,7 +655,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %{python3_sitelib}/dnf-plugins/changelog.py
 %{python3_sitelib}/dnf-plugins/config_manager.py
 %{python3_sitelib}/dnf-plugins/copr.py
+%if %{with debug_plugin}
 %{python3_sitelib}/dnf-plugins/debug.py
+%endif
 %{python3_sitelib}/dnf-plugins/debuginfo-install.py
 %{python3_sitelib}/dnf-plugins/download.py
 %{python3_sitelib}/dnf-plugins/generate_completion_cache.py
@@ -641,7 +673,9 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %{python3_sitelib}/dnf-plugins/__pycache__/changelog.*
 %{python3_sitelib}/dnf-plugins/__pycache__/config_manager.*
 %{python3_sitelib}/dnf-plugins/__pycache__/copr.*
+%if %{with debug_plugin}
 %{python3_sitelib}/dnf-plugins/__pycache__/debug.*
+%endif
 %{python3_sitelib}/dnf-plugins/__pycache__/debuginfo-install.*
 %{python3_sitelib}/dnf-plugins/__pycache__/download.*
 %{python3_sitelib}/dnf-plugins/__pycache__/generate_completion_cache.*
@@ -675,8 +709,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %{_bindir}/repotrack
 %{_bindir}/yum-builddep
 %{_bindir}/yum-config-manager
+%if %{with debug_plugin}
 %{_bindir}/yum-debug-dump
 %{_bindir}/yum-debug-restore
+%endif
 %{_bindir}/yum-groups-manager
 %{_bindir}/yumdownloader
 %{_mandir}/man1/debuginfo-install.*
@@ -688,8 +724,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %{_mandir}/man1/reposync.*
 %{_mandir}/man1/yum-builddep.*
 %{_mandir}/man1/yum-config-manager.*
+%if %{with debug_plugin}
 %{_mandir}/man1/yum-debug-dump.*
 %{_mandir}/man1/yum-debug-restore.*
+%endif
 %{_mandir}/man1/yum-groups-manager.*
 %{_mandir}/man1/yumdownloader.*
 %{_mandir}/man1/package-cleanup.*
@@ -710,8 +748,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %exclude %{_mandir}/man1/reposync.*
 %exclude %{_mandir}/man1/yum-builddep.*
 %exclude %{_mandir}/man1/yum-config-manager.*
+%if %{with debug_plugin}
 %exclude %{_mandir}/man1/yum-debug-dump.*
 %exclude %{_mandir}/man1/yum-debug-restore.*
+%endif
 %exclude %{_mandir}/man1/yum-groups-manager.*
 %exclude %{_mandir}/man1/yumdownloader.*
 %exclude %{_mandir}/man1/package-cleanup.*
@@ -869,6 +909,10 @@ ln -sf %{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1
 %endif
 
 %changelog
+* Tue Jul 09 2024 Petr Pisar <ppisar@redhat.com> - 4.7.0-5
+- Remove debug plugin (i.e. dnf debug-dump and and debug-restore commands)
+  (RHEL-23706)
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.7.0-4
 - Bump release for June 2024 mass rebuild