From 6e8bb7f838d4004e68b1a7c94371b7e87ea91fb9 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Mon, 22 May 2017 13:40:00 +0200
Subject: [PATCH] Update to 2.1.0-1

---
 .gitignore            |  1 +
 dnf-plugins-core.spec | 66 ++++++++++++++++++++++++++++++++++++++++++-
 sources               |  2 +-
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa67563..47c03ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /dnf-plugins-core-1.0.2.tar.gz
 /dnf-plugins-core-1.1.0.tar.gz
 /dnf-plugins-core-2.0.0.tar.gz
+/dnf-plugins-core-2.1.0.tar.gz
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index 35bb612..c1a5cf9 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           dnf-plugins-core
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Core Plugins for DNF
 License:        GPLv2+
@@ -121,6 +121,25 @@ copr, debug, debuginfo-install, download, needs-restarting, repoclosure, repogra
 reposync commands. Additionally provides generate_completion_cache passive plugin.
 %endif
 
+%package -n dnf-utils
+Conflicts:      yum-utils < 1.1.31-513
+Requires:       dnf >= %{dnf_lowest_compatible}
+Requires:       %{name} = %{version}-%{release}
+%if %{with python3}
+Requires:       python3-dnf >= %{dnf_lowest_compatible}
+Requires:       python3-dnf < %{dnf_not_compatible}
+%else
+Requires:       python2-dnf >= %{dnf_lowest_compatible}
+Requires:       python2-dnf < %{dnf_not_compatible}
+%endif
+Summary:        Yum-utils CLI compatibility layer
+
+%description -n dnf-utils
+As a Yum-utils CLI compatibility layer, supplies in CLI shims for
+debuginfo-install, repograph, package-cleanup, repoclosure, repomanage,
+repoquery, reposync, repotrack, builddep, config-manager, debug, and
+download that use new implementations using DNF.
+
 %package -n python2-dnf-plugin-leaves
 Summary:        Leaves Plugin for DNF
 Requires:       python2-%{name} = %{version}-%{release}
@@ -308,6 +327,28 @@ pushd build-py3
 popd
 %endif
 %find_lang %{name}
+%if %{with python3}
+mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils
+%else
+mv %{buildroot}%{_libexecdir}/dnf-utils-2 %{buildroot}%{_libexecdir}/dnf-utils
+%endif
+rm -vf %{buildroot}%{_libexecdir}/dnf-utils-*
+
+mkdir -p %{buildroot}%{_bindir}
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repo-graph
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/package-cleanup
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoclosure
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repomanage
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repoquery
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/reposync
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/repotrack
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-builddep
+ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager
+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
 
 %check
 PYTHONPATH=./plugins nosetests-%{python2_version} -s tests/
@@ -381,6 +422,23 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %{python3_sitelib}/dnfpluginscore/
 %endif
 
+%files -n dnf-utils
+%{_libexecdir}/dnf-utils
+%{_bindir}/debuginfo-install
+%{_bindir}/find-repos-of-install
+%{_bindir}/package-cleanup
+%{_bindir}/repo-graph
+%{_bindir}/repoclosure
+%{_bindir}/repomanage
+%{_bindir}/repoquery
+%{_bindir}/reposync
+%{_bindir}/repotrack
+%{_bindir}/yum-builddep
+%{_bindir}/yum-config-manager
+%{_bindir}/yum-debug-dump
+%{_bindir}/yum-debug-restore
+%{_bindir}/yumdownloader
+
 %files -n python2-dnf-plugin-leaves
 %{python2_sitelib}/dnf-plugins/leaves.*
 %{_mandir}/man8/dnf.plugin.leaves.*
@@ -436,6 +494,12 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %endif
 
 %changelog
+* Mon May 22 2017 Jaroslav Mracek <jmracek@redhat.com> 2.1.0-1
+- bump version to 2.1.0 + update release notes (Jaroslav Mracek)
+- Adjust the dnf-utils subpackage to be more accurate (Neal Gompa)
+- Add new sub-package dnf-utils (RhBug:1381917) (Jaroslav Mracek)
+- Fix two renamed functions by dnf privatization (Jaroslav Mracek)
+
 * Tue May 02 2017 Jaroslav Mracek <jmracek@redhat.com> 2.0.0-1
 - update release notes (Jaroslav Mracek)
 - po: Update translations (Igor Gnatenko)
diff --git a/sources b/sources
index c4a1a15..9d8b308 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-plugins-core-2.0.0.tar.gz) = 395158ae0455d552e4af154388692be444cca08ba9be9660e95b8ad6b3a47ed7875d119412913c08aaecb181eba0629d9b4a836587383077e7393e418f21e930
+SHA512 (dnf-plugins-core-2.1.0.tar.gz) = 8ff27602a332fe54f7200a137fe4bd36a878d933310d73682e16487b6df4a418ac891cfc70c00e9665719ce794e215062172aef0f118dc6969df75484d5ae8af