From 307ea85d888c5684143c47f3bba94b5f4dd1e4ec Mon Sep 17 00:00:00 2001
From: Martin Hatina <mhatina@redhat.com>
Date: Mon, 26 Mar 2018 11:02:13 +0200
Subject: [PATCH] rebase to dnf-2-modularity-3 release

---
 .gitignore |  3 +++
 dnf.spec   | 12 +++++++++---
 sources    |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 479e189..91780ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,6 @@
 /dnf-2.7.4.tar.gz
 /dnf-2.7.5.tar.gz
 /dnf-2.7.5-modularity.tar.gz
+/dnf-2.7.5-modularity-2.tar
+/dnf-2.7.5-modularity-2.tar.gz
+/dnf-2.7.5-modularity-3.tar.gz
diff --git a/dnf.spec b/dnf.spec
index 9c13c6e..ea3932b 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -28,12 +28,12 @@
 
 Name:           dnf
 Version:        2.7.5
-Release:        8%{?dist}
+Release:        9%{?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.tar.gz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}-modularity-3.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
@@ -208,7 +208,7 @@ Requires:       %{name} = %{version}-%{release}
 Alternative CLI to "dnf upgrade" suitable for automatic, regular execution.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}-modularity
+%autosetup -p1 -n %{name}-%{version}-modularity-3
 mkdir build
 %if %{with python3}
 mkdir build-py3
@@ -240,6 +240,7 @@ popd
 
 mkdir -p %{buildroot}%{pluginconfpath}/
 mkdir -p %{buildroot}%{py2pluginpath}/
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.d
 %if %{with python3}
 mkdir -p %{buildroot}%{py3pluginpath}/__pycache__/
 %endif
@@ -354,6 +355,7 @@ popd
 %exclude %{python2_sitelib}/%{name}/automatic
 %{python2_sitelib}/%{name}/
 %dir %{py2pluginpath}
+%dir %{_sysconfdir}/%{name}/modules.d
 
 %if %{with python3}
 %files -n python3-%{name}
@@ -362,6 +364,7 @@ popd
 %{python3_sitelib}/%{name}/
 %dir %{py3pluginpath}
 %dir %{py3pluginpath}/__pycache__
+%dir %{_sysconfdir}/%{name}/modules.d
 %endif
 
 %files automatic
@@ -385,6 +388,9 @@ popd
 %endif
 
 %changelog
+* Mon Mar 26 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-9
+- Rebase to dnf from dnf-2-modularity-3 release.
+
 * Mon Feb 12 2018 Daniel Mach <dmach@redhat.com> - 2.7.5-8
 - Rebase to dnf from dnf-2-modularity branch.
 
diff --git a/sources b/sources
index 091ccb7..dc64989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-2.7.5-modularity.tar.gz) = ae9259fdd90a22122db8a52d77772c6cb6950f8362bb7f291b404f7995aa2f45858981eee72e342a81550ef788c29fea0817c37f9f7e4e591e97616b7b5fc80e
+SHA512 (dnf-2.7.5-modularity-3.tar.gz) = db031348c108b083cca8159ae8610eca6fc8c7eac2f0375118b50b5cc2599cbd6c7ecbc2c1a840c648f22fdfb382f3dec4c8b372ec37a110536f08667581be47