From e3d122c2f8d5711f897fa6d7aceab6df95f56c09 Mon Sep 17 00:00:00 2001 From: Pavla Kratochvilova Date: Wed, 7 Aug 2019 12:59:18 +0200 Subject: [PATCH] Update to 4.0.9 --- .gitignore | 1 + dnf-plugins-core.spec | 65 ++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index d0e3dac..556bb91 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /dnf-plugins-core-4.0.4.tar.gz /dnf-plugins-core-4.0.6.tar.gz /dnf-plugins-core-4.0.7.tar.gz +/dnf-plugins-core-4.0.9.tar.gz diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 91dd8c5..1507c5b 100644 --- a/dnf-plugins-core.spec +++ b/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.8} %global dnf_plugins_extra 2.0.0 -%global hawkey_version 0.7.0 +%global hawkey_version 0.34.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,21 +14,25 @@ %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 -Release: 2%{?dist} +Version: 4.0.9 +Release: 1%{?dist} Summary: Core Plugins for DNF License: GPLv2+ URL: https://github.com/rpm-software-management/dnf-plugins-core @@ -157,12 +165,17 @@ repoclosure, repograph, repomanage, reposync, changelog and repodiff commands. Additionally provides generate_completion_cache passive plugin. %endif -%if %{with dnfutils} -%package -n dnf-utils +%if %{with yumutils} +%package -n %{yum_utils_subpackage_name} +%if "%{yum_utils_subpackage_name}" == "dnf-utils" Conflicts: yum-utils < 1.1.31-530 %if 0%{?rhel} != 7 Provides: yum-utils = %{version}-%{release} %endif +%else +Provides: dnf-utils = %{version}-%{release} +Obsoletes: dnf-utils < %{version}-%{release} +%endif Requires: dnf >= %{dnf_lowest_compatible} Requires: %{name} = %{version}-%{release} %if %{with python3} @@ -172,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 @@ -389,7 +402,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 @@ -398,7 +411,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 @@ -449,10 +462,10 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %{_mandir}/man8/dnf.plugin.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} @@ -519,8 +532,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 @@ -538,7 +551,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.* @@ -553,14 +565,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. +# 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.* @@ -684,6 +695,20 @@ PYTHONPATH=./plugins nosetests-%{python3_version} -s tests/ %endif %changelog +* Tue Aug 13 2019 Pavla Kratochvilova - 4.0.9-1 +- Update to 4.0.9 +- [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 +- [builddep] Report all rpm errors (RhBug:1663619,1658292,1724668) +- [config-manager] --setopt: Fix crash with "--save --dump" +- [config-manager] --setopt: Add globs support to repoid +- [config-manager] --setopt=key=value is applied only to the main config +- [config-manager] --setopt and empty list of repositories (RhBug:1702678) +- [config-manager] --setopt: Add check for existence of input repositories + * Wed Jul 24 2019 Fedora Release Engineering - 4.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 9a96a47..99a316b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnf-plugins-core-4.0.7.tar.gz) = 126c87892b1c30be142ca3c54e93d572b49253d178d6fda5ebf9d8f80811a7717f6854e3a3aacf4b5068a03479d05c0c88b1f04735e162c98270a4eb54d0bb78 +SHA512 (dnf-plugins-core-4.0.9.tar.gz) = 57f2aa21be73101a0fb7f2c026a88ed11f6d96de1bebc563dd43ef1f6b2f167ac4399c780dc34a81da6b6015894c9aefb46b3af61d18839e80d568902702c879