From 9c06f4b2612eecc0ea474cb5e3b965ea3946ba90 Mon Sep 17 00:00:00 2001 From: Jaroslav Mracek Date: Fri, 7 Sep 2018 12:54:58 +0200 Subject: [PATCH] Update to 3.0.3 --- .gitignore | 1 + dnf-plugins-core.spec | 115 ++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 107 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b0577ac..ad767f6 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /dnf-plugins-core-2.1.5.tar.gz /dnf-plugins-core-3.0.1.tar.gz /dnf-plugins-core-3.0.2.tar.gz +/dnf-plugins-core-3.0.3.tar.gz diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 61af448..9845260 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -1,4 +1,4 @@ -%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.0.1} +%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 3.5.0} %{?!dnf_not_compatible: %global dnf_not_compatible 4.0} %global dnf_plugins_extra 2.0.0 %global hawkey_version 0.7.0 @@ -11,12 +11,20 @@ %if 0%{?rhel} > 7 %bcond_with python2 +%bcond_without yumcompatibility %else %bcond_without python2 +%bcond_with yumcompatibility +%endif + +%if 0%{?rhel} && 0%{?rhel} <= 7 +%bcond_with dnfutils +%else +%bcond_without dnfutils %endif Name: dnf-plugins-core -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} Summary: Core Plugins for DNF License: GPLv2+ @@ -57,6 +65,9 @@ Provides: dnf-plugin-repoclosure = %{version}-%{release} 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 +%endif Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} %description @@ -136,6 +147,7 @@ copr, debug, debuginfo-install, download, needs-restarting, repoclosure, repogra reposync commands. Additionally provides generate_completion_cache passive plugin. %endif +%if %{with dnfutils} %package -n dnf-utils Conflicts: yum-utils < 1.1.31-513 %if 0%{?rhel} != 7 @@ -157,8 +169,9 @@ As a Yum-utils CLI compatibility layer, supplies in CLI shims for debuginfo-install, repograph, package-cleanup, repoclosure, repomanage, repoquery, reposync, repotrack, builddep, config-manager, debug, and download that use new implementations using DNF. +%endif -%if %{with python2} +%if 0%{?rhel} == 0 && %{with python2} %package -n python2-dnf-plugin-leaves Summary: Leaves Plugin for DNF Requires: python2-%{name} = %{version}-%{release} @@ -177,7 +190,7 @@ Leaves Plugin for DNF, Python 2 version. List all installed packages not required by any other installed package. %endif -%if %{with python3} +%if 0%{?rhel} == 0 && %{with python3} %package -n python3-dnf-plugin-leaves Summary: Leaves Plugin for DNF Requires: python3-%{name} = %{version}-%{release} @@ -247,7 +260,7 @@ Obsoletes: python-dnf-plugins-extras-migrate < %{dnf_plugins_extra} Migrate Plugin for DNF, Python 2 version. Migrates history, group and yumdb data from yum to dnf. %endif -%if %{with python2} +%if 0%{?rhel} == 0 && %{with python2} %package -n python2-dnf-plugin-show-leaves Summary: Leaves Plugin for DNF Requires: python2-%{name} = %{version}-%{release} @@ -268,7 +281,7 @@ packages that are no longer required by any other installed package after a transaction. %endif -%if %{with python3} +%if 0%{?rhel} == 0 && %{with python3} %package -n python3-dnf-plugin-show-leaves Summary: Show-leaves Plugin for DNF Requires: python3-%{name} = %{version}-%{release} @@ -295,6 +308,9 @@ Requires: python2-%{name} = %{version}-%{release} Provides: dnf-plugin-versionlock = %{version}-%{release} Provides: dnf-command(versionlock) Provides: dnf-plugins-extras-versionlock = %{version}-%{release} +%if %{with yumcompatibility} +Provides: yum-plugin-versionlock +%endif %endif Provides: python2-dnf-plugins-extras-versionlock = %{version}-%{release} Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} @@ -314,6 +330,9 @@ Requires: python3-%{name} = %{version}-%{release} 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 +%endif Provides: dnf-plugins-extras-versionlock = %{version}-%{release} Conflicts: dnf-plugins-extras-common-data < %{dnf_plugins_extra} Conflicts: python2-dnf-plugin-versionlock < %{version}-%{release} @@ -362,13 +381,16 @@ pushd build-py3 popd %endif %find_lang %{name} -%if %{with python3} -mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils -%else -mv %{buildroot}%{_libexecdir}/dnf-utils-2 %{buildroot}%{_libexecdir}/dnf-utils +%if %{with dnfutils} + %if %{with python3} + mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils + %else + mv %{buildroot}%{_libexecdir}/dnf-utils-2 %{buildroot}%{_libexecdir}/dnf-utils + %endif %endif rm -vf %{buildroot}%{_libexecdir}/dnf-utils-* +%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 @@ -384,6 +406,7 @@ ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-config-manager ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-dump ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yum-debug-restore ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/yumdownloader +%endif %check %if %{with python2} @@ -406,6 +429,31 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf.plugin.repograph.* %{_mandir}/man8/dnf.plugin.repomanage.* %{_mandir}/man8/dnf.plugin.reposync.* +%if %{with yumcompatibility} +%{_mandir}/man8/yum-copr.* +%{_mandir}/man1/debuginfo-install.* +%{_mandir}/man1/needs-restarting.* +%{_mandir}/man1/repo-graph.* +%{_mandir}/man1/repoclosure.* +%{_mandir}/man1/repomanage.* +%{_mandir}/man1/reposync.* +%{_mandir}/man1/yum-builddep.* +%{_mandir}/man1/yum-config-manager.* +%{_mandir}/man1/yum-debug-dump.* +%{_mandir}/man1/yum-debug-restore.* +%else +%exclude %{_mandir}/man8/yum-copr.* +%exclude %{_mandir}/man1/debuginfo-install.* +%exclude %{_mandir}/man1/needs-restarting.* +%exclude %{_mandir}/man1/repo-graph.* +%exclude %{_mandir}/man1/repoclosure.* +%exclude %{_mandir}/man1/repomanage.* +%exclude %{_mandir}/man1/reposync.* +%exclude %{_mandir}/man1/yum-builddep.* +%exclude %{_mandir}/man1/yum-config-manager.* +%exclude %{_mandir}/man1/yum-debug-dump.* +%exclude %{_mandir}/man1/yum-debug-restore.* +%endif %if %{with python2} %files -n python2-%{name} -f %{name}.lang @@ -461,6 +509,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{python3_sitelib}/dnfpluginscore/ %endif +%if %{with dnfutils} %files -n dnf-utils %{_libexecdir}/dnf-utils %{_bindir}/debuginfo-install @@ -477,6 +526,9 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_bindir}/yum-debug-dump %{_bindir}/yum-debug-restore %{_bindir}/yumdownloader +%endif + +%if 0%{?rhel} == 0 %if %{with python2} %files -n python2-dnf-plugin-leaves @@ -491,6 +543,17 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf.plugin.leaves.* %endif +%else +%exclude %{_mandir}/man8/dnf.plugin.leaves.* +%if %{with python2} +%exclude %{python2_sitelib}/dnf-plugins/leaves.* +%endif +%if %{with python3} +%exclude %{python3_sitelib}/dnf-plugins/leaves.* +%exclude %{python3_sitelib}/dnf-plugins/__pycache__/leaves.* +%endif +%endif # 0%{?rhel} == 0 + %if 0%{?rhel} == 0 && %{with python2} %files -n python2-dnf-plugin-local %config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf @@ -512,6 +575,8 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf.plugin.migrate.* %endif +%if 0%{?rhel} == 0 + %if %{with python2} %files -n python2-dnf-plugin-show-leaves %{python2_sitelib}/dnf-plugins/show_leaves.* @@ -525,12 +590,30 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf.plugin.show-leaves.* %endif +%else +%exclude %{_mandir}/man8/dnf.plugin.show-leaves.* +%if %{with python2} +%exclude %{python2_sitelib}/dnf-plugins/show_leaves.* +%endif +%if %{with python3} +%exclude %{python3_sitelib}/dnf-plugins/show_leaves.* +%exclude %{python3_sitelib}/dnf-plugins/__pycache__/show_leaves.* +%endif +%endif # 0%{?rhel} == 0 + %if %{with python2} %files -n python2-dnf-plugin-versionlock %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.conf %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.list %{python2_sitelib}/dnf-plugins/versionlock.* %{_mandir}/man8/dnf.plugin.versionlock.* +%if %{with yumcompatibility} +%{_mandir}/man8/yum-versionlock.* +%{_mandir}/man5/yum-versionlock.* +%else +%exclude %{_mandir}/man8/yum-versionlock.* +%exclude %{_mandir}/man5/yum-versionlock.* +%endif %endif %if %{with python3} @@ -540,9 +623,21 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{python3_sitelib}/dnf-plugins/versionlock.* %{python3_sitelib}/dnf-plugins/__pycache__/versionlock.* %{_mandir}/man8/dnf.plugin.versionlock.* +%if %{with yumcompatibility} +%{_mandir}/man8/yum-versionlock.* +%{_mandir}/man5/yum-versionlock.* +%else +%exclude %{_mandir}/man8/yum-versionlock.* +%exclude %{_mandir}/man5/yum-versionlock.* +%endif %endif %changelog +* Fri Sep 07 2018 Jaroslav Mracek - 3.0.3-1 +- Resolves: rhbz#1582152 +- Resolves: rhbz#1581117 +- Resolves: rhbz#1579737 + * Mon Jul 23 2018 Marek Blaha 3.0.2-1 - Resolves: rhbz#1603805 - Resolves: rhbz#1571251 diff --git a/sources b/sources index fb4c6a2..d48ab25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnf-plugins-core-3.0.2.tar.gz) = 4f1f23df17a24524dfcc0eadb5953310e347bd61db976ad7a6f2ba5a9fa06377db337866cb0554041e81abb7b6e671596fc6c8dff9c57402ca3de59df2134113 +SHA512 (dnf-plugins-core-3.0.3.tar.gz) = d423f37347299279bfc554b943aeee37989945f5fec75ef7e8938832469f57bc0fd618cd1b6545c287111853fdb2ec5eccc219e065d76978aaa38daa63ab1a00