From 0111d57b73c75f49b4f3d7d4d21589c394556f56 Mon Sep 17 00:00:00 2001
From: Martin Hatina <mhatina@redhat.com>
Date: Tue, 17 Apr 2018 16:11:00 +0200
Subject: [PATCH] rebase to dnf-2-modularity-4 release

---
 .gitignore |  1 +
 dnf.spec   | 20 +++++++++++++-------
 sources    |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91780ca..b2c5413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@
 /dnf-2.7.5-modularity-2.tar
 /dnf-2.7.5-modularity-2.tar.gz
 /dnf-2.7.5-modularity-3.tar.gz
+/dnf-2.7.5-modularity-4.tar.gz
diff --git a/dnf.spec b/dnf.spec
index d329886..c15a117 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -28,12 +28,12 @@
 
 Name:           dnf
 Version:        2.7.5
-Release:        10%{?dist}
+Release:        11%{?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}-modularity-3.tar.gz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}-modularity-4.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,8 +147,8 @@ BuildRequires:  python2-rpm >= %{rpm_version}
 Requires:       python2-rpm >= %{rpm_version}
 Recommends:     rpm-plugin-systemd-inhibit
 %endif
-BuildRequires:  libmodulemd
-Requires:       libmodulemd
+BuildRequires:  libmodulemd >= 1.3.0
+Requires:       libmodulemd >= 1.3.0
 BuildRequires:  python2-gobject-base
 Requires:       python2-gobject-base
 BuildRequires:  python2-smartcols >= 0.3.0
@@ -187,8 +187,8 @@ Requires:       rpm-plugin-systemd-inhibit
 %else
 Recommends:     rpm-plugin-systemd-inhibit
 %endif
-BuildRequires:  libmodulemd
-Requires:       libmodulemd
+BuildRequires:  libmodulemd >= 1.3.0
+Requires:       libmodulemd >= 1.3.0
 BuildRequires:  python3-gobject-base
 Requires:       python3-gobject-base
 BuildRequires:  python3-smartcols >= 0.3.0
@@ -212,7 +212,7 @@ Requires:       %{name} = %{version}-%{release}
 Alternative CLI to "dnf upgrade" suitable for automatic, regular execution.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}-modularity-3
+%autosetup -p1 -n %{name}-%{version}-modularity-4
 mkdir build
 %if %{with python3}
 mkdir build-py3
@@ -245,6 +245,7 @@ popd
 mkdir -p %{buildroot}%{pluginconfpath}/
 mkdir -p %{buildroot}%{py2pluginpath}/
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.d
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.defaults.d
 %if %{with python3}
 mkdir -p %{buildroot}%{py3pluginpath}/__pycache__/
 %endif
@@ -360,6 +361,7 @@ popd
 %{python2_sitelib}/%{name}/
 %dir %{py2pluginpath}
 %dir %{_sysconfdir}/%{name}/modules.d
+%dir %{_sysconfdir}/%{name}/modules.defaults.d
 
 %if %{with python3}
 %files -n python3-%{name}
@@ -369,6 +371,7 @@ popd
 %dir %{py3pluginpath}
 %dir %{py3pluginpath}/__pycache__
 %dir %{_sysconfdir}/%{name}/modules.d
+%dir %{_sysconfdir}/%{name}/modules.defaults.d
 %endif
 
 %files automatic
@@ -392,6 +395,9 @@ popd
 %endif
 
 %changelog
+* Tue Apr 17 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-11
+- Rebase to dnf from dnf-2-modularity-4 release.
+
 * Mon Mar 26 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-10
 - Require libmodulemd.
 
diff --git a/sources b/sources
index dc64989..cb16ca9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-2.7.5-modularity-3.tar.gz) = db031348c108b083cca8159ae8610eca6fc8c7eac2f0375118b50b5cc2599cbd6c7ecbc2c1a840c648f22fdfb382f3dec4c8b372ec37a110536f08667581be47
+SHA512 (dnf-2.7.5-modularity-4.tar.gz) = 3f2baa8f1dd713b2637c788f41a2070cb3847e7e18edf853bc9c9bb5534aa59f3438cdf406ae28e31d614cf7480c4a06d47651c09a2a17a13948112c96a90ba6