From bae210dad7144d7c92c03c0bd469f7fc88628811 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 17:54:34 -0500 Subject: [PATCH] import dnf-plugins-core-4.0.12-1.el8 --- .dnf-plugins-core.metadata | 2 +- .gitignore | 2 +- SPECS/dnf-plugins-core.spec | 209 ++++++++++++++++++++++++++---------- 3 files changed, 154 insertions(+), 59 deletions(-) diff --git a/.dnf-plugins-core.metadata b/.dnf-plugins-core.metadata index 95c07e7..38f3cac 100644 --- a/.dnf-plugins-core.metadata +++ b/.dnf-plugins-core.metadata @@ -1 +1 @@ -5c8fd9936d89405c2b4dbcf71c6f3856e1fb924e SOURCES/dnf-plugins-core-4.0.7.tar.gz +5618d7b20c37876e97e4e508952229835a430281 SOURCES/dnf-plugins-core-4.0.12.tar.gz diff --git a/.gitignore b/.gitignore index 07f1749..2d04b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dnf-plugins-core-4.0.7.tar.gz +SOURCES/dnf-plugins-core-4.0.12.tar.gz diff --git a/SPECS/dnf-plugins-core.spec b/SPECS/dnf-plugins-core.spec index f737f4c..f606176 100644 --- a/SPECS/dnf-plugins-core.spec +++ b/SPECS/dnf-plugins-core.spec @@ -1,6 +1,10 @@ -%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 4.2.1} +%{?!dnf_lowest_compatible: %global dnf_lowest_compatible 4.2.17} %global dnf_plugins_extra 2.0.0 -%global hawkey_version 0.7.0 +%global hawkey_version 0.37.0 +%global yum_utils_subpackage_name dnf-utils +%if 0%{?rhel} > 7 +%global yum_utils_subpackage_name yum-utils +%endif %if 0%{?rhel} && 0%{?rhel} <= 7 %bcond_with python3 @@ -10,26 +14,29 @@ %if 0%{?rhel} > 7 || 0%{?fedora} > 29 %bcond_with python2 -%bcond_without yumcompatibility %else %bcond_without python2 +%endif + +%if 0%{?rhel} > 7 || 0%{?fedora} > 30 +%bcond_without yumcompatibility +%else %bcond_with yumcompatibility %endif %if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with dnfutils +%bcond_with yumutils %else -%bcond_without dnfutils +%bcond_without yumutils %endif Name: dnf-plugins-core -Version: 4.0.7 +Version: 4.0.12 Release: 1%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz - BuildArch: noarch BuildRequires: cmake BuildRequires: gettext @@ -158,12 +165,16 @@ repoclosure, repograph, repomanage, reposync, changelog and repodiff commands. Additionally provides generate_completion_cache passive plugin. %endif -%if %{with dnfutils} -%package -n dnf-utils -Conflicts: yum-utils < 1.1.31-513 +%if %{with yumutils} +%package -n %{yum_utils_subpackage_name} +%if "%{yum_utils_subpackage_name}" == "dnf-utils" +Conflicts: yum-utils < 1.1.31-520 %if 0%{?rhel} != 7 Provides: yum-utils = %{version}-%{release} -Obsoletes: yum-utils < 1.1.31-513 +%endif +%else +Provides: dnf-utils = %{version}-%{release} +Obsoletes: dnf-utils < %{version}-%{release} %endif Requires: dnf >= %{dnf_lowest_compatible} Requires: %{name} = %{version}-%{release} @@ -174,7 +185,7 @@ Requires: python2-dnf >= %{dnf_lowest_compatible} %endif Summary: Yum-utils CLI compatibility layer -%description -n dnf-utils +%description -n %{yum_utils_subpackage_name} As a Yum-utils CLI compatibility layer, supplies in CLI shims for debuginfo-install, repograph, package-cleanup, repoclosure, repomanage, repoquery, reposync, repotrack, repodiff, builddep, config-manager, debug @@ -270,6 +281,34 @@ 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} +%package -n python2-dnf-plugin-post-transaction-actions +Summary: Post transaction actions Plugin for DNF +Requires: python2-%{name} = %{version}-%{release} +%if !%{with python3} +Provides: dnf-plugin-post-transaction-actions = %{version}-%{release} +%endif +Conflicts: python3-dnf-plugin-post-transaction-actions < %{version}-%{release} + +%description -n python2-dnf-plugin-post-transaction-actions +Post transaction actions Plugin for DNF, Python 2 version. Plugin runs actions +(shell commands) after transaction is completed. Actions are defined in action +files. +%endif + +%if %{with python3} +%package -n python3-dnf-plugin-post-transaction-actions +Summary: Post transaction actions Plugin for DNF +Requires: python3-%{name} = %{version}-%{release} +Provides: dnf-plugin-post-transaction-actions = %{version}-%{release} +Conflicts: python2-dnf-plugin-post-transaction-actions < %{version}-%{release} + +%description -n python3-dnf-plugin-post-transaction-actions +Post transaction actions Plugin for DNF, Python 3 version. Plugin runs actions +(shell commands) after transaction is completed. Actions are defined in action +files. +%endif + %if 0%{?rhel} == 0 && %{with python2} %package -n python2-dnf-plugin-show-leaves Summary: Leaves Plugin for DNF @@ -391,7 +430,7 @@ pushd build-py3 popd %endif %find_lang %{name} -%if %{with dnfutils} +%if %{with yumutils} %if %{with python3} mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils %else @@ -400,7 +439,7 @@ popd %endif rm -vf %{buildroot}%{_libexecdir}/dnf-utils-* -%if %{with dnfutils} +%if %{with yumutils} mkdir -p %{buildroot}%{_bindir} ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/debuginfo-install ln -sf %{_libexecdir}/dnf-utils %{buildroot}%{_bindir}/needs-restarting @@ -418,12 +457,11 @@ 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 -# These commands don't have a dedicated man page, so let's just point them to -# dnf-utils(1) which contains the descriptions. -ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz -ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz -ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz -ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/yum-utils.1.gz +# These commands don't have a dedicated man page, so let's just point them +# to the utils page which contains their descriptions. +ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/find-repos-of-install.1.gz +ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz +ln -sf %{_mandir}/man1/%{yum_utils_subpackage_name}.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz %endif %check @@ -435,33 +473,33 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %endif %files -%{_mandir}/man8/dnf.plugin.builddep.* -%{_mandir}/man8/dnf.plugin.changelog.* -%{_mandir}/man8/dnf.plugin.config_manager.* -%{_mandir}/man8/dnf.plugin.copr.* -%{_mandir}/man8/dnf.plugin.debug.* -%{_mandir}/man8/dnf.plugin.debuginfo-install.* -%{_mandir}/man8/dnf.plugin.download.* -%{_mandir}/man8/dnf.plugin.generate_completion_cache.* -%{_mandir}/man8/dnf.plugin.needs_restarting.* -%{_mandir}/man8/dnf.plugin.repoclosure.* -%{_mandir}/man8/dnf.plugin.repodiff.* -%{_mandir}/man8/dnf.plugin.repograph.* -%{_mandir}/man8/dnf.plugin.repomanage.* -%{_mandir}/man8/dnf.plugin.reposync.* +%{_mandir}/man8/dnf-builddep.* +%{_mandir}/man8/dnf-changelog.* +%{_mandir}/man8/dnf-config-manager.* +%{_mandir}/man8/dnf-copr.* +%{_mandir}/man8/dnf-debug.* +%{_mandir}/man8/dnf-debuginfo-install.* +%{_mandir}/man8/dnf-download.* +%{_mandir}/man8/dnf-generate_completion_cache.* +%{_mandir}/man8/dnf-needs-restarting.* +%{_mandir}/man8/dnf-repoclosure.* +%{_mandir}/man8/dnf-repodiff.* +%{_mandir}/man8/dnf-repograph.* +%{_mandir}/man8/dnf-repomanage.* +%{_mandir}/man8/dnf-reposync.* %if %{with yumcompatibility} %{_mandir}/man1/yum-changelog.* -%{_mandir}/man5/yum-changelog.conf.* +%{_mandir}/man8/yum-copr.* %else %exclude %{_mandir}/man1/yum-changelog.* -%exclude %{_mandir}/man5/yum-changelog.conf.* +%exclude %{_mandir}/man8/yum-copr.* %endif %if %{with python2} %files -n python2-%{name} -f %{name}.lang %license COPYING %doc AUTHORS README.rst -%ghost %{_var}/cache/dnf/packages.db +%ghost %attr(644,-,-) %{_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 @@ -486,7 +524,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %files -n python3-%{name} -f %{name}.lang %license COPYING %doc AUTHORS README.rst -%ghost %{_var}/cache/dnf/packages.db +%ghost %attr(644,-,-) %{_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 @@ -521,8 +559,8 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{python3_sitelib}/dnfpluginscore/ %endif -%if %{with dnfutils} -%files -n dnf-utils +%if %{with yumutils} +%files -n %{yum_utils_subpackage_name} %{_libexecdir}/dnf-utils %{_bindir}/debuginfo-install %{_bindir}/needs-restarting @@ -540,7 +578,6 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_bindir}/yum-debug-dump %{_bindir}/yum-debug-restore %{_bindir}/yumdownloader -%{_mandir}/man8/yum-copr.* %{_mandir}/man1/debuginfo-install.* %{_mandir}/man1/needs-restarting.* %{_mandir}/man1/repo-graph.* @@ -555,14 +592,13 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man1/yumdownloader.* %{_mandir}/man1/package-cleanup.* %{_mandir}/man1/dnf-utils.* -# These are only built with dnfutils bcond. +%{_mandir}/man1/yum-utils.* +# These are only built with yumutils bcond. %{_mandir}/man1/find-repos-of-install.* %{_mandir}/man1/repoquery.* %{_mandir}/man1/repotrack.* -%{_mandir}/man1/yum-utils.* %else -# These are built regardless of dnfutils bcond so we need to exclude them. -%exclude %{_mandir}/man8/yum-copr.* +# These are built regardless of yumutils bcond so we need to exclude them. %exclude %{_mandir}/man1/debuginfo-install.* %exclude %{_mandir}/man1/needs-restarting.* %exclude %{_mandir}/man1/repo-graph.* @@ -577,6 +613,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %exclude %{_mandir}/man1/yumdownloader.* %exclude %{_mandir}/man1/package-cleanup.* %exclude %{_mandir}/man1/dnf-utils.* +%exclude %{_mandir}/man1/yum-utils.* %endif %if 0%{?rhel} == 0 @@ -584,18 +621,18 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %if %{with python2} %files -n python2-dnf-plugin-leaves %{python2_sitelib}/dnf-plugins/leaves.* -%{_mandir}/man8/dnf.plugin.leaves.* +%{_mandir}/man8/dnf-leaves.* %endif %if %{with python3} %files -n python3-dnf-plugin-leaves %{python3_sitelib}/dnf-plugins/leaves.* %{python3_sitelib}/dnf-plugins/__pycache__/leaves.* -%{_mandir}/man8/dnf.plugin.leaves.* +%{_mandir}/man8/dnf-leaves.* %endif %else -%exclude %{_mandir}/man8/dnf.plugin.leaves.* +%exclude %{_mandir}/man8/dnf-leaves.* %if %{with python2} %exclude %{python2_sitelib}/dnf-plugins/leaves.* %endif @@ -609,7 +646,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %files -n python2-dnf-plugin-local %config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf %{python2_sitelib}/dnf-plugins/local.* -%{_mandir}/man8/dnf.plugin.local.* +%{_mandir}/man8/dnf-local.* %endif %if %{with python3} && 0%{?rhel} == 0 @@ -617,15 +654,32 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %config(noreplace) %{_sysconfdir}/dnf/plugins/local.conf %{python3_sitelib}/dnf-plugins/local.* %{python3_sitelib}/dnf-plugins/__pycache__/local.* -%{_mandir}/man8/dnf.plugin.local.* +%{_mandir}/man8/dnf-local.* %endif %if %{with python2} %files -n python2-dnf-plugin-migrate %{python2_sitelib}/dnf-plugins/migrate.* -%{_mandir}/man8/dnf.plugin.migrate.* +%{_mandir}/man8/dnf-migrate.* %else -%exclude %{_mandir}/man8/dnf.plugin.migrate.* +%exclude %{_mandir}/man8/dnf-migrate.* +%endif + +%if %{with python2} +%files -n python2-dnf-plugin-post-transaction-actions +%config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.conf +%config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.d +%{python2_sitelib}/dnf-plugins/post-transaction-actions.* +%{_mandir}/man8/dnf-post-transaction-actions.* +%endif + +%if %{with python3} +%files -n python3-dnf-plugin-post-transaction-actions +%config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.conf +%config(noreplace) %{_sysconfdir}/dnf/plugins/post-transaction-actions.d +%{python3_sitelib}/dnf-plugins/post-transaction-actions.* +%{python3_sitelib}/dnf-plugins/__pycache__/post-transaction-actions.* +%{_mandir}/man8/dnf-post-transaction-actions.* %endif %if 0%{?rhel} == 0 @@ -633,18 +687,18 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %if %{with python2} %files -n python2-dnf-plugin-show-leaves %{python2_sitelib}/dnf-plugins/show_leaves.* -%{_mandir}/man8/dnf.plugin.show-leaves.* +%{_mandir}/man8/dnf-show-leaves.* %endif %if %{with python3} %files -n python3-dnf-plugin-show-leaves %{python3_sitelib}/dnf-plugins/show_leaves.* %{python3_sitelib}/dnf-plugins/__pycache__/show_leaves.* -%{_mandir}/man8/dnf.plugin.show-leaves.* +%{_mandir}/man8/dnf-show-leaves.* %endif %else -%exclude %{_mandir}/man8/dnf.plugin.show-leaves.* +%exclude %{_mandir}/man8/dnf-show-leaves.* %if %{with python2} %exclude %{python2_sitelib}/dnf-plugins/show_leaves.* %endif @@ -659,7 +713,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.conf %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.list %{python2_sitelib}/dnf-plugins/versionlock.* -%{_mandir}/man8/dnf.plugin.versionlock.* +%{_mandir}/man8/dnf-versionlock.* %if %{with yumcompatibility} %{_mandir}/man8/yum-versionlock.* %{_mandir}/man5/yum-versionlock.* @@ -675,7 +729,7 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %config(noreplace) %{_sysconfdir}/dnf/plugins/versionlock.list %{python3_sitelib}/dnf-plugins/versionlock.* %{python3_sitelib}/dnf-plugins/__pycache__/versionlock.* -%{_mandir}/man8/dnf.plugin.versionlock.* +%{_mandir}/man8/dnf-versionlock.* %if %{with yumcompatibility} %{_mandir}/man8/yum-versionlock.* %{_mandir}/man5/yum-versionlock.* @@ -686,6 +740,47 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %endif %changelog +* Mon Nov 25 2019 Ales Matej - 4.0.12-1 +- Update to 4.0.12 +- [reposync] Add --urls option (RhBug:1686602) +- [versionlock] Add --raw option (RhBug:1645564) +- [doc] move manpages for plugins to "dnf-PLUGIN" (RhBug:1706386) +- Add new plugin post-transaction-actions (RhBug:967264) +- [builddep] Add --skip-unavailable switch (RhBug:1628634) +- [versionlock] Don't apply excludes on @System (RhBug:1726712) +- [reposync] Ignore only modular excludes (RhBug:1750273) + +* Thu Nov 14 2019 Ales Matej - 4.0.11-1 +- Update to 4.0.11 +- [spec] Specify attributes for ghost file (RhBug:1754463) +- download: add the --debugsource option (RhBug:1637008) +- Fix incorrect handling richdeps in buildep (RhBug:1756902) + +* Tue Oct 22 2019 Ales Matej - 4.0.10-1 +- Update to 4.0.10 +- debuginfo-install: Update both debuginfo and debugsource for updated package (RhBug:1586084) +- copr: Support multilib repofiles (RhBug:1393664) +- copr: Fix disable if copr instance has non-default port +- copr: Fix repoid when using subdirectories in copr project + +* Wed Aug 14 2019 Pavla Kratochvilova - 4.0.8-3 +- Generate yum-utils(1) instead of symlinking (RhBug:1676418) + +* Tue Aug 06 2019 Pavla Kratochvilova - 4.0.8-2 +- Update localizations from zanata (RhBug:1689984) +- Rename dnf-utils to yum-utils (RhBug:1722093) +- [builddep] Report all rpm errors (RhBug:1724668) +- [config-manager] Behaviour of --setopt (RhBug:1702678) + +* Tue Jun 11 2019 Pavla Kratochvilova - 4.0.8-1 +- Update to 4.0.8 +- [reposync] Enable timestamp preserving for downloaded data (RhBug:1688537) +- [reposync] Download packages from all streams (RhBug:1714788) +- Make yum-copr manpage available (RhBug:1673902) +- [needs-restarting] Add --reboothint option (RhBug:1192946) (RhBug:1639468) +- Set the cost of ``_dnf_local`` repo to 500, to make it preferred to normal + repos + * Mon May 13 2019 Pavla Kratochvilova - 4.0.7-1 - Update to 4.0.7 - Use improved config parser that preserves order of data