|
 |
e582f9 |
From 134d5405d024e6e313e24062ed92fa2a946e0287 Mon Sep 17 00:00:00 2001
|
|
|
e582f9 |
From: Michal Domonkos <mdomonko@redhat.com>
|
|
|
e582f9 |
Date: Fri, 9 Aug 2019 17:34:58 +0200
|
|
|
e582f9 |
Subject: [PATCH] [spec] Generate yum-utils(1) instead of symlinking (RhBug:1676418)
|
|
|
e582f9 |
|
|
|
e582f9 |
This ensures that the man page actually says "yum-utils" instead of
|
|
|
e582f9 |
"dnf-utils" in the beginning.
|
|
|
e582f9 |
---
|
|
|
e582f9 |
dnf-plugins-core.spec | 12 ++++++------
|
|
|
e582f9 |
doc/CMakeLists.txt | 1 +
|
|
|
e582f9 |
doc/conf.py | 2 ++
|
|
|
e582f9 |
3 files changed, 9 insertions(+), 6 deletions(-)
|
|
|
e582f9 |
|
|
|
e582f9 |
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
|
|
|
e582f9 |
index b84477f..a072438 100644
|
|
|
e582f9 |
--- a/dnf-plugins-core.spec
|
|
|
e582f9 |
+++ b/dnf-plugins-core.spec
|
|
|
e582f9 |
@@ -428,11 +428,10 @@ ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump
|
|
|
e582f9 |
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore
|
|
|
e582f9 |
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader
|
|
|
e582f9 |
# These commands don't have a dedicated man page, so let's just point them to
|
|
|
e582f9 |
-# dnf-utils(1) which contains the descriptions.
|
|
|
e582f9 |
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
|
|
|
e582f9 |
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
|
|
|
e582f9 |
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
|
|
|
e582f9 |
-ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/yum-utils.1.gz
|
|
|
e582f9 |
+# to the utils page which contains their descriptions.
|
|
|
e582f9 |
+ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz
|
|
|
e582f9 |
+ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
|
|
|
e582f9 |
+ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
%check
|
|
|
e582f9 |
@@ -563,11 +562,11 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
|
|
|
e582f9 |
%{_mandir}/man1/yumdownloader.*
|
|
|
e582f9 |
%{_mandir}/man1/package-cleanup.*
|
|
|
e582f9 |
%{_mandir}/man1/dnf-utils.*
|
|
|
e582f9 |
+%{_mandir}/man1/yum-utils.*
|
|
|
e582f9 |
# These are only built with yumutils bcond.
|
|
|
e582f9 |
%{_mandir}/man1/find-repos-of-install.*
|
|
|
e582f9 |
%{_mandir}/man1/repoquery.*
|
|
|
e582f9 |
%{_mandir}/man1/repotrack.*
|
|
|
e582f9 |
-%{_mandir}/man1/yum-utils.*
|
|
|
e582f9 |
%else
|
|
|
e582f9 |
# These are built regardless of yumutils bcond so we need to exclude them.
|
|
|
e582f9 |
%exclude %{_mandir}/man1/debuginfo-install.*
|
|
|
e582f9 |
@@ -584,6 +583,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
|
|
|
e582f9 |
%exclude %{_mandir}/man1/yumdownloader.*
|
|
|
e582f9 |
%exclude %{_mandir}/man1/package-cleanup.*
|
|
|
e582f9 |
%exclude %{_mandir}/man1/dnf-utils.*
|
|
|
e582f9 |
+%exclude %{_mandir}/man1/yum-utils.*
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
%if 0%{?rhel} == 0
|
|
|
e582f9 |
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
|
e582f9 |
index b4ba2d5..b258c84 100644
|
|
|
e582f9 |
--- a/doc/CMakeLists.txt
|
|
|
e582f9 |
+++ b/doc/CMakeLists.txt
|
|
|
e582f9 |
@@ -60,6 +60,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/debuginfo-install.1
|
|
|
e582f9 |
${CMAKE_CURRENT_BINARY_DIR}/yumdownloader.1
|
|
|
e582f9 |
${CMAKE_CURRENT_BINARY_DIR}/package-cleanup.1
|
|
|
e582f9 |
${CMAKE_CURRENT_BINARY_DIR}/dnf-utils.1
|
|
|
e582f9 |
+ ${CMAKE_CURRENT_BINARY_DIR}/yum-utils.1
|
|
|
e582f9 |
DESTINATION share/man/man1)
|
|
|
e582f9 |
|
|
|
e582f9 |
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/yum-versionlock.conf.5
|
|
|
e582f9 |
diff --git a/doc/conf.py b/doc/conf.py
|
|
|
e582f9 |
index b4bbba5..fd6d28c 100644
|
|
|
e582f9 |
--- a/doc/conf.py
|
|
|
e582f9 |
+++ b/doc/conf.py
|
|
|
e582f9 |
@@ -293,6 +293,8 @@ man_pages = [
|
|
|
e582f9 |
'orphaned packages.', AUTHORS, 1),
|
|
|
e582f9 |
('dnf-utils', 'dnf-utils', u'classic YUM utilities implemented as CLI shims on top of DNF',
|
|
|
e582f9 |
AUTHORS, 1),
|
|
|
e582f9 |
+ ('dnf-utils', 'yum-utils', u'classic YUM utilities implemented as CLI shims on top of DNF',
|
|
|
e582f9 |
+ AUTHORS, 1),
|
|
|
e582f9 |
]
|
|
|
e582f9 |
|
|
|
e582f9 |
# If true, show URL addresses after external links.
|
|
|
e582f9 |
--
|
|
|
e582f9 |
libgit2 0.28.2
|
|
|
e582f9 |
|