From 4ec9f4b3ff625716c4df8e139d65c5bbb38858a6 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Wed, 17 Oct 2018 13:40:21 +0200
Subject: [PATCH] Enable dnf-utils for Fedora 29

---
 dnf-plugins-core.spec | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index ee1b377..d2a28a8 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -16,9 +16,15 @@
 %bcond_with yumcompatibility
 %endif
 
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%bcond_with dnfutils
+%else
+%bcond_without dnfutils
+%endif
+
 Name:           dnf-plugins-core
 Version:        4.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Core Plugins for DNF
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/dnf-plugins-core
@@ -137,7 +143,7 @@ copr, debug, debuginfo-install, download, needs-restarting, repoclosure, repogra
 reposync commands. Additionally provides generate_completion_cache passive plugin.
 %endif
 
-%if %{with yumcompatibility}
+%if %{with dnfutils}
 %package -n dnf-utils
 Conflicts:      yum-utils < 1.1.31-513
 %if 0%{?rhel} != 7
@@ -369,7 +375,7 @@ pushd build-py3
 popd
 %endif
 %find_lang %{name}
-%if %{with yumcompatibility}
+%if %{with dnfutils}
   %if %{with python3}
   mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils
   %else
@@ -378,7 +384,7 @@ popd
 %endif
 rm -vf %{buildroot}%{_libexecdir}/dnf-utils-*
 
-%if %{with yumcompatibility}
+%if %{with dnfutils}
 mkdir -p %{buildroot}%{_bindir}
 ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install
 ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/find-repos-of-install
@@ -482,7 +488,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %{python3_sitelib}/dnfpluginscore/
 %endif
 
-%if %{with yumcompatibility}
+%if %{with dnfutils}
 %files -n dnf-utils
 %{_libexecdir}/dnf-utils
 %{_bindir}/debuginfo-install
@@ -513,13 +519,13 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %{_mandir}/man1/yumdownloader.*
 %{_mandir}/man1/package-cleanup.*
 %{_mandir}/man1/dnf-utils.*
-# These are only built with yumcompatibility.
+# These are only built with dnfutils bcond.
 %{_mandir}/man1/find-repos-of-install.*
 %{_mandir}/man1/repoquery.*
 %{_mandir}/man1/repotrack.*
 %{_mandir}/man1/yum-utils.*
 %else
-# These are built regardless of yumcompatibility so we need to exclude them.
+# These are built regardless of dnfutils bcond so we need to exclude them.
 %exclude %{_mandir}/man8/yum-copr.*
 %exclude %{_mandir}/man1/debuginfo-install.*
 %exclude %{_mandir}/man1/needs-restarting.*
@@ -643,6 +649,9 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %endif
 
 %changelog
+* Wed Oct 17 2018 Jaroslav Mracek <jmracek@redhat.com> - 4.0.0-2
+- Allow build of dnf-utils in F29
+
 * Mon Oct 15 2018 Jaroslav Mracek <jmracek@redhat.com> - 4.0.0-1
 - Update to 4.0.0
 - Enhance documentation