From 134d5405d024e6e313e24062ed92fa2a946e0287 Mon Sep 17 00:00:00 2001
From: Michal Domonkos <mdomonko@redhat.com>
Date: Fri, 9 Aug 2019 17:34:58 +0200
Subject: [PATCH] [spec] Generate yum-utils(1) instead of symlinking (RhBug:1676418)

This ensures that the man page actually says "yum-utils" instead of
"dnf-utils" in the beginning.
---
 dnf-plugins-core.spec | 12 ++++++------
 doc/CMakeLists.txt    |  1 +
 doc/conf.py           |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index b84477f..a072438 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -428,11 +428,10 @@ ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
 ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
 ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
 # These commands don't have a dedicated man page, so let's just point them to
-# dnf-utils(1) which contains the descriptions.
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/yum-utils.1.gz
+# to the utils page which contains their descriptions.
+ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
+ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
+ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
 %endif
 
 %check
@@ -563,11 +562,11 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %{_mandir}/man1/yumdownloader.*
 %{_mandir}/man1/package-cleanup.*
 %{_mandir}/man1/dnf-utils.*
+%{_mandir}/man1/yum-utils.*
 # These are only built with yumutils bcond.
 %{_mandir}/man1/find-repos-of-install.*
 %{_mandir}/man1/repoquery.*
 %{_mandir}/man1/repotrack.*
-%{_mandir}/man1/yum-utils.*
 %else
 # These are built regardless of yumutils bcond so we need to exclude them.
 %exclude %{_mandir}/man1/debuginfo-install.*
@@ -584,6 +583,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %exclude %{_mandir}/man1/yumdownloader.*
 %exclude %{_mandir}/man1/package-cleanup.*
 %exclude %{_mandir}/man1/dnf-utils.*
+%exclude %{_mandir}/man1/yum-utils.*
 %endif
 
 %if 0%{?rhel} == 0
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b4ba2d5..b258c84 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -60,6 +60,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/debuginfo-install.1
     ${CMAKE_CURRENT_BINARY_DIR}/yumdownloader.1
     ${CMAKE_CURRENT_BINARY_DIR}/package-cleanup.1
     ${CMAKE_CURRENT_BINARY_DIR}/dnf-utils.1
+    ${CMAKE_CURRENT_BINARY_DIR}/yum-utils.1
 	DESTINATION share/man/man1)
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/yum-versionlock.conf.5
diff --git a/doc/conf.py b/doc/conf.py
index b4bbba5..fd6d28c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -293,6 +293,8 @@ man_pages = [
      'orphaned packages.', AUTHORS, 1),
     ('dnf-utils', 'dnf-utils', u'classic YUM utilities implemented as CLI shims on top of DNF',
      AUTHORS, 1),
+    ('dnf-utils', 'yum-utils', u'classic YUM utilities implemented as CLI shims on top of DNF',
+     AUTHORS, 1),
 ]
 
 # If true, show URL addresses after external links.
--
libgit2 0.28.2