|
 |
e582f9 |
From 322125be1b32e9fedb2a9ea25e6e9af5f255e225 Mon Sep 17 00:00:00 2001
|
|
|
e582f9 |
From: Jaroslav Mracek <jmracek@redhat.com>
|
|
|
e582f9 |
Date: Wed, 26 Jun 2019 14:56:00 +0200
|
|
|
e582f9 |
Subject: [PATCH 1/2] [spec] Rename dnf-utils to yum-utils (RhBug:1722093)
|
|
|
e582f9 |
|
|
|
e582f9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1722093
|
|
|
e582f9 |
---
|
|
|
e582f9 |
dnf-plugins-core.spec | 29 ++++++++++++++++++-----------
|
|
|
e582f9 |
1 file changed, 18 insertions(+), 11 deletions(-)
|
|
|
e582f9 |
|
|
|
e582f9 |
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
|
|
|
e582f9 |
index 154ee7f..be01cd2 100644
|
|
|
e582f9 |
--- a/dnf-plugins-core.spec
|
|
|
e582f9 |
+++ b/dnf-plugins-core.spec
|
|
|
e582f9 |
@@ -1,6 +1,7 @@
|
|
|
e582f9 |
%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 4.2.1}
|
|
|
e582f9 |
%global dnf_plugins_extra 2.0.0
|
|
|
e582f9 |
%global hawkey_version 0.34.0
|
|
|
e582f9 |
+%global yum_utils_subpackage_name dnf-utils
|
|
|
e582f9 |
|
|
|
e582f9 |
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
|
e582f9 |
%bcond_with python3
|
|
|
e582f9 |
@@ -15,15 +16,16 @@
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
%if 0%{?rhel} > 7 || 0%{?fedora} > 30
|
|
|
e582f9 |
+%global yum_utils_subpackage_name yum-utils
|
|
|
e582f9 |
%bcond_without yumcompatibility
|
|
|
e582f9 |
%else
|
|
|
e582f9 |
%bcond_with yumcompatibility
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
|
e582f9 |
-%bcond_with dnfutils
|
|
|
e582f9 |
+%bcond_with yumutils
|
|
|
e582f9 |
%else
|
|
|
e582f9 |
-%bcond_without dnfutils
|
|
|
e582f9 |
+%bcond_without yumutils
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
Name: dnf-plugins-core
|
|
|
e582f9 |
@@ -161,12 +163,17 @@ repoclosure, repograph, repomanage, reposync, changelog and repodiff commands.
|
|
|
e582f9 |
Additionally provides generate_completion_cache passive plugin.
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
-%if %{with dnfutils}
|
|
|
e582f9 |
-%package -n dnf-utils
|
|
|
e582f9 |
+%if %{with yumutils}
|
|
|
e582f9 |
+%package -n %{yum_utils_subpackage_name}
|
|
|
e582f9 |
+%if "%{yum_utils_subpackage_name}" == "dnf-utils"
|
|
|
e582f9 |
Conflicts: yum-utils < 1.1.31-513
|
|
|
e582f9 |
%if 0%{?rhel} != 7
|
|
|
e582f9 |
Provides: yum-utils = %{version}-%{release}
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
+%else
|
|
|
e582f9 |
+Provides: dnf-utils = %{version}-%{release}
|
|
|
e582f9 |
+Obsoletes: dnf-utils < %{version}-%{release}
|
|
|
e582f9 |
+%endif
|
|
|
e582f9 |
Requires: dnf >= %{dnf_lowest_compatible}
|
|
|
e582f9 |
Requires: %{name} = %{version}-%{release}
|
|
|
e582f9 |
%if %{with python3}
|
|
|
e582f9 |
@@ -176,7 +183,7 @@ Requires: python2-dnf >= %{dnf_lowest_compatible}
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
Summary: Yum-utils CLI compatibility layer
|
|
|
e582f9 |
|
|
|
e582f9 |
-%description -n dnf-utils
|
|
|
e582f9 |
+%description -n %{yum_utils_subpackage_name}
|
|
|
e582f9 |
As a Yum-utils CLI compatibility layer, supplies in CLI shims for
|
|
|
e582f9 |
debuginfo-install, repograph, package-cleanup, repoclosure, repomanage,
|
|
|
e582f9 |
repoquery, reposync, repotrack, repodiff, builddep, config-manager, debug
|
|
|
e582f9 |
@@ -393,7 +400,7 @@ pushd build-py3
|
|
|
e582f9 |
popd
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
%find_lang %{name}
|
|
|
e582f9 |
-%if %{with dnfutils}
|
|
|
e582f9 |
+%if %{with yumutils}
|
|
|
e582f9 |
%if %{with python3}
|
|
|
e582f9 |
mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils
|
|
|
e582f9 |
%else
|
|
|
e582f9 |
@@ -402,7 +409,7 @@ popd
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
rm -vf %{buildroot}%{_libexecdir}/dnf-utils-*
|
|
|
e582f9 |
|
|
|
e582f9 |
-%if %{with dnfutils}
|
|
|
e582f9 |
+%if %{with yumutils}
|
|
|
e582f9 |
mkdir -p %{buildroot}%{_bindir}
|
|
|
e582f9 |
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
|
|
|
e582f9 |
ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/needs-restarting
|
|
|
e582f9 |
@@ -523,8 +530,8 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
|
|
|
e582f9 |
%{python3_sitelib}/dnfpluginscore/
|
|
|
e582f9 |
%endif
|
|
|
e582f9 |
|
|
|
e582f9 |
-%if %{with dnfutils}
|
|
|
e582f9 |
-%files -n dnf-utils
|
|
|
e582f9 |
+%if %{with yumutils}
|
|
|
e582f9 |
+%files -n %{yum_utils_subpackage_name}
|
|
|
e582f9 |
%{_libexecdir}/dnf-utils
|
|
|
e582f9 |
%{_bindir}/debuginfo-install
|
|
|
e582f9 |
%{_bindir}/needs-restarting
|
|
|
e582f9 |
@@ -556,13 +563,13 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
|
|
|
e582f9 |
%{_mandir}/man1/yumdownloader.*
|
|
|
e582f9 |
%{_mandir}/man1/package-cleanup.*
|
|
|
e582f9 |
%{_mandir}/man1/dnf-utils.*
|
|
|
e582f9 |
-# These are only built with dnfutils bcond.
|
|
|
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 dnfutils bcond so we need to exclude them.
|
|
|
e582f9 |
+# These are built regardless of yumutils bcond so we need to exclude them.
|
|
|
e582f9 |
%exclude %{_mandir}/man1/debuginfo-install.*
|
|
|
e582f9 |
%exclude %{_mandir}/man1/needs-restarting.*
|
|
|
e582f9 |
%exclude %{_mandir}/man1/repo-graph.*
|
|
|
e582f9 |
--
|
|
|
e582f9 |
2.21.0
|
|
|
e582f9 |
|
|
|
e582f9 |
|
|
|
e582f9 |
From a58ded1019343ea50cf40bd94ad6aaf69fa91a37 Mon Sep 17 00:00:00 2001
|
|
|
e582f9 |
From: Jaroslav Mracek <jmracek@redhat.com>
|
|
|
e582f9 |
Date: Thu, 27 Jun 2019 09:22:29 +0200
|
|
|
e582f9 |
Subject: [PATCH 2/2] [doc] Changed header in dnf-utils/yum-utils documentation
|
|
|
e582f9 |
(RhBug:1722093)
|
|
|
e582f9 |
|
|
|
e582f9 |
The documentation is mainly yum-utils description and package from
|
|
|
e582f9 |
Fedora 31 is going to be renamed to yum-utils, therefore the primary
|
|
|
e582f9 |
name in documentation should be yum-utils.
|
|
|
e582f9 |
|
|
|
e582f9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1722093
|
|
|
e582f9 |
---
|
|
|
e582f9 |
doc/dnf-utils.rst | 4 ++--
|
|
|
e582f9 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
e582f9 |
|
|
|
e582f9 |
diff --git a/doc/dnf-utils.rst b/doc/dnf-utils.rst
|
|
|
e582f9 |
index 02dfc1d..311e980 100644
|
|
|
e582f9 |
--- a/doc/dnf-utils.rst
|
|
|
e582f9 |
+++ b/doc/dnf-utils.rst
|
|
|
e582f9 |
@@ -1,8 +1,8 @@
|
|
|
e582f9 |
=========
|
|
|
e582f9 |
-DNF Utils
|
|
|
e582f9 |
+YUM Utils
|
|
|
e582f9 |
=========
|
|
|
e582f9 |
|
|
|
e582f9 |
-The main purpose of these shims is ensuring backward compatibility.
|
|
|
e582f9 |
+The main purpose of these shims is ensuring backward compatibility with yum-3.
|
|
|
e582f9 |
|
|
|
e582f9 |
--------------
|
|
|
e582f9 |
Shell Commands
|
|
|
e582f9 |
--
|
|
|
e582f9 |
2.21.0
|
|
|
e582f9 |
|