From c614077d9c2cc8a395f96c5dd2dbad5ec9f06bb2 Mon Sep 17 00:00:00 2001
From: Daniel Mach <dmach@redhat.com>
Date: Mon, 12 Feb 2018 15:58:48 +0100
Subject: [PATCH] Rebase to dnf from dnf-2-modularity branch.

---
 .gitignore |  1 +
 dnf.spec   | 17 ++++++++++++++---
 sources    |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d25c408..479e189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,4 @@
 /dnf-2.7.3.tar.gz
 /dnf-2.7.4.tar.gz
 /dnf-2.7.5.tar.gz
+/dnf-2.7.5-modularity.tar.gz
diff --git a/dnf.spec b/dnf.spec
index 8e33bee..9c13c6e 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -28,12 +28,12 @@
 
 Name:           dnf
 Version:        2.7.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Package manager forked from Yum, using libsolv as a dependency resolver
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+ and GPLv2 and GPL
 URL:            https://github.com/rpm-software-management/dnf
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}-modularity.tar.gz
 Patch0:         0001-Allow-to-set-cacheonly-from-commands-and-conf-RhBug-.patch
 Patch1:         0002-Remove-redundant-conf-option-cacheonly.patch
 Patch2:         0003-Remove-unnecessary-code-for-set-cacheonly.patch
@@ -147,6 +147,10 @@ BuildRequires:  python2-rpm >= %{rpm_version}
 Requires:       python2-rpm >= %{rpm_version}
 Recommends:     rpm-plugin-systemd-inhibit
 %endif
+BuildRequires:  python2-modulemd
+Requires:       python2-modulemd
+BuildRequires:  python2-smartcols >= 0.3.0
+Requires:       python2-smartcols >= 0.3.0
 # dnf-langpacks package is retired in F25
 # to have clean upgrade path for dnf-langpacks
 Obsoletes:      python-dnf-langpacks < %{dnf_langpacks_ver}
@@ -181,6 +185,10 @@ Requires:       rpm-plugin-systemd-inhibit
 %else
 Recommends:     rpm-plugin-systemd-inhibit
 %endif
+BuildRequires:  python3-modulemd
+Requires:       python3-modulemd
+BuildRequires:  python3-smartcols >= 0.3.0
+Requires:       python3-smartcols >= 0.3.0
 # dnf-langpacks package is retired in F25
 # to have clean upgrade path for dnf-langpacks
 Obsoletes:      python3-dnf-langpacks < %{dnf_langpacks_ver}
@@ -200,7 +208,7 @@ Requires:       %{name} = %{version}-%{release}
 Alternative CLI to "dnf upgrade" suitable for automatic, regular execution.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{version}-modularity
 mkdir build
 %if %{with python3}
 mkdir build-py3
@@ -377,6 +385,9 @@ popd
 %endif
 
 %changelog
+* Mon Feb 12 2018 Daniel Mach <dmach@redhat.com> - 2.7.5-8
+- Rebase to dnf from dnf-2-modularity branch.
+
 * Thu Feb 08 2018 Igor Gnatenko <ignatenko@redhat.com> - 2.7.5-7
 - Demote deltarpm to weak dependencies
 
diff --git a/sources b/sources
index 83eb64f..091ccb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-2.7.5.tar.gz) = ef40385b48084d2b3b5711cf06f5080be5a16f44d6c30fd48a2691346fe4b5c6a1afce8b722b9fef8322f49c2eab871a7ad3a4cc649b023f18722efc1e805f90
+SHA512 (dnf-2.7.5-modularity.tar.gz) = ae9259fdd90a22122db8a52d77772c6cb6950f8362bb7f291b404f7995aa2f45858981eee72e342a81550ef788c29fea0817c37f9f7e4e591e97616b7b5fc80e