From 1ce259561cda90a8ebc37486211876b86afb4948 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Tue, 25 Sep 2018 11:44:18 +0200
Subject: [PATCH] Update to 3.0.4

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

diff --git a/.gitignore b/.gitignore
index ad767f6..e46bbc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /dnf-plugins-core-3.0.1.tar.gz
 /dnf-plugins-core-3.0.2.tar.gz
 /dnf-plugins-core-3.0.3.tar.gz
+/dnf-plugins-core-3.0.4.tar.gz
diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index 9845260..379e071 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -1,4 +1,4 @@
-%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.5.0}
+%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.6.1}
 %{?!dnf_not_compatible: %global dnf_not_compatible 4.0}
 %global dnf_plugins_extra 2.0.0
 %global hawkey_version 0.7.0
@@ -9,7 +9,7 @@
 %bcond_without python3
 %endif
 
-%if 0%{?rhel} > 7
+%if 0%{?rhel} > 7 || 0%{?fedora} > 29
 %bcond_with python2
 %bcond_without yumcompatibility
 %else
@@ -24,7 +24,7 @@
 %endif
 
 Name:           dnf-plugins-core
-Version:        3.0.3
+Version:        3.0.4
 Release:        1%{?dist}
 Summary:        Core Plugins for DNF
 License:        GPLv2+
@@ -66,7 +66,7 @@ Provides:       dnf-plugin-repograph = %{version}-%{release}
 Provides:       dnf-plugin-repomanage = %{version}-%{release}
 Provides:       dnf-plugin-reposync = %{version}-%{release}
 %if %{with yumcompatibility}
-Provides:       yum-plugin-copr
+Provides:       yum-plugin-copr = %{version}-%{release}
 %endif
 Conflicts:      dnf-plugins-extras-common-data < %{dnf_plugins_extra}
 
@@ -309,7 +309,7 @@ Provides:       dnf-plugin-versionlock =  %{version}-%{release}
 Provides:       dnf-command(versionlock)
 Provides:       dnf-plugins-extras-versionlock = %{version}-%{release}
 %if %{with yumcompatibility}
-Provides:       yum-plugin-versionlock
+Provides:       yum-plugin-versionlock = %{version}-%{release}
 %endif
 %endif
 Provides:       python2-dnf-plugins-extras-versionlock = %{version}-%{release}
@@ -331,7 +331,7 @@ Provides:       dnf-plugin-versionlock =  %{version}-%{release}
 Provides:       python3-dnf-plugins-extras-versionlock = %{version}-%{release}
 Provides:       dnf-command(versionlock)
 %if %{with yumcompatibility}
-Provides:       yum-plugin-versionlock
+Provides:       yum-plugin-versionlock = %{version}-%{release}
 %endif
 Provides:       dnf-plugins-extras-versionlock = %{version}-%{release}
 Conflicts:      dnf-plugins-extras-common-data < %{dnf_plugins_extra}
@@ -460,6 +460,8 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %license COPYING
 %doc AUTHORS README.rst
 %ghost %{_var}/cache/dnf/packages.db
+%config(noreplace) %{_sysconfdir}/dnf/plugins/copr.conf
+%config(noreplace) %{_sysconfdir}/dnf/plugins/copr.d
 %config(noreplace) %{_sysconfdir}/dnf/plugins/debuginfo-install.conf
 %{python2_sitelib}/dnf-plugins/builddep.*
 %{python2_sitelib}/dnf-plugins/config_manager.*
@@ -481,6 +483,8 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %license COPYING
 %doc AUTHORS README.rst
 %ghost %{_var}/cache/dnf/packages.db
+%config(noreplace) %{_sysconfdir}/dnf/plugins/copr.conf
+%config(noreplace) %{_sysconfdir}/dnf/plugins/copr.d
 %config(noreplace) %{_sysconfdir}/dnf/plugins/debuginfo-install.conf
 %{python3_sitelib}/dnf-plugins/builddep.py
 %{python3_sitelib}/dnf-plugins/config_manager.py
@@ -573,6 +577,8 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %files -n python2-dnf-plugin-migrate
 %{python2_sitelib}/dnf-plugins/migrate.*
 %{_mandir}/man8/dnf.plugin.migrate.*
+%else
+%exclude %{_mandir}/man8/dnf.plugin.migrate.*
 %endif
 
 %if 0%{?rhel} == 0
@@ -633,6 +639,13 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/
 %endif
 
 %changelog
+* Tue Sep 25 2018 Jaroslav Mracek <jmracek@redhat.com> - 3.0.4-1
+- [copr] Huge upgrade of copr plugin
+- [spec] Disable building python2 modules on Fedora 30+
+- Add characters into repo URL sanitization (RhBug:1615416)
+- copr: add support for multiple copr instances (RhBug:1478208)
+- Redirect repo progress to std error (RhBug:1626011)
+
 * Fri Sep 07 2018 Jaroslav Mracek <jmracek@redhat.com> - 3.0.3-1
 - Resolves: rhbz#1582152
 - Resolves: rhbz#1581117
diff --git a/sources b/sources
index d48ab25..c0f701a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnf-plugins-core-3.0.3.tar.gz) = d423f37347299279bfc554b943aeee37989945f5fec75ef7e8938832469f57bc0fd618cd1b6545c287111853fdb2ec5eccc219e065d76978aaa38daa63ab1a00
+SHA512 (dnf-plugins-core-3.0.4.tar.gz) = ae154e6018af94007535518c3f197cf96974ace7c3b358927d3e9283d0f3c17ab6ee59b532bcf3ed396cfde9f05e998b4a3e7d44009c43e6b6c2e19fb28d6405