From 11de21938f961185019e278338812ade487aa021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 3 Oct 2025 13:30:46 +0200 Subject: [PATCH] Rename dnf4-multisig(8) manual page to dnf-multisig(8) Resolves: RHEL-117134 --- ...dnf4-multisig-8-manual-page-to-dnf-m.patch | 78 +++++++++++++++++++ dnf-plugins-core.spec | 8 +- 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 0025-multisig-Rename-dnf4-multisig-8-manual-page-to-dnf-m.patch diff --git a/0025-multisig-Rename-dnf4-multisig-8-manual-page-to-dnf-m.patch b/0025-multisig-Rename-dnf4-multisig-8-manual-page-to-dnf-m.patch new file mode 100644 index 0000000..192af35 --- /dev/null +++ b/0025-multisig-Rename-dnf4-multisig-8-manual-page-to-dnf-m.patch @@ -0,0 +1,78 @@ +From e1aebc68eb031f3e91ed39a0b145589f1a4a1734 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 3 Oct 2025 12:23:11 +0200 +Subject: [PATCH] multisig: Rename dnf4-multisig(8) manual page to + dnf-multisig(8) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To align with all other plugin manual pages. +Create dnf4-multisig(8) symlink for compatibility. + +FILE(CREATE_LINK) is available since cmake 3.14. + +Resolve: https://issues.redhat.com/browse/RHEL-117134 +Signed-off-by: Petr Písař +--- + CMakeLists.txt | 2 +- + dnf-plugins-core.spec | 2 +- + doc/CMakeLists.txt | 4 ++++ + doc/conf.py | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1eea7b..86225e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + PROJECT (dnf-plugins-core NONE) +-CMAKE_MINIMUM_REQUIRED (VERSION 2.4) ++CMAKE_MINIMUM_REQUIRED (VERSION 3.14) + + if (NOT WITHOUT_LOCAL) + set (WITHOUT_LOCAL "0") +diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec +index cb3b1b8..ff6beea 100644 +--- a/dnf-plugins-core.spec ++++ b/dnf-plugins-core.spec +@@ -40,7 +40,7 @@ License: GPLv2+ + URL: https://github.com/rpm-software-management/dnf-plugins-core + Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + BuildArch: noarch +-BuildRequires: cmake ++BuildRequires: cmake >= 3.14 + BuildRequires: gettext + # Documentation + %if %{with python3} +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 297506a..75e74bb 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -48,6 +48,10 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf-migrate.8 + endif() + + if (${PYTHON_VERSION_MAJOR} STREQUAL "3") ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf-multisig.8 ++ DESTINATION share/man/man8) ++FILE(CREATE_LINK dnf-multisig.8 ${CMAKE_CURRENT_BINARY_DIR}/dnf4-multisig.8 ++ SYMBOLIC) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf4-multisig.8 + DESTINATION share/man/man8) + endif() +diff --git a/doc/conf.py b/doc/conf.py +index 2845d18..225ae5f 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -301,7 +301,7 @@ if sys.version_info[0] < 3: + man_pages.append(('migrate', 'dnf-migrate', u'DNF migrate Plugin', AUTHORS, 8)) + + if sys.version_info[0] == 3: +- man_pages.append(('multisig', 'dnf4-multisig', u'DNF multisig Plugin', AUTHORS, 8)) ++ man_pages.append(('multisig', 'dnf-multisig', u'DNF multisig Plugin', AUTHORS, 8)) + + # If true, show URL addresses after external links. + #man_show_urls = False +-- +2.51.0 + diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index b37a196..69b2133 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -34,7 +34,7 @@ Name: dnf-plugins-core Version: 4.3.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core @@ -60,9 +60,10 @@ Patch21: 0021-dnf-copr-enable-on-Asahi-Fedora-Linux-Remix-guesses.patch Patch22: 0022-reposync-Avoid-multiple-downloads-of-duplicate-packa.patch Patch23: 0023-multisig-A-new-plugin-for-verifying-extraordinary-RP.patch Patch24: 0024-multisig-Do-not-parse-OpenPGP-keys.patch +Patch25: 0025-multisig-Rename-dnf4-multisig-8-manual-page-to-dnf-m.patch BuildArch: noarch -BuildRequires: cmake +BuildRequires: cmake >= 3.14 BuildRequires: gettext # Documentation %if %{with python3} @@ -826,6 +827,9 @@ ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/ %endif %changelog +* Fri Oct 03 2025 Petr Pisar - 4.3.0-24 +- Rename dnf4-multisig(8) manual page to dnf-multisig(8) (RHEL-117134) + * Mon Sep 15 2025 Petr Pisar - 4.3.0-23 - Fix importing OpenPGPv6 keys (RHEL-114424)