diff --git a/.gitignore b/.gitignore index 5576cb6..a5e7714 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ /dnf-4.0.4.tar.gz /dnf-4.0.9.tar.gz /dnf-4.0.10.tar.gz +/dnf-4.1.0.tar.gz diff --git a/0001-Revert-Add-best-as-default-behavior-RhBug16707761671683.patch b/0001-Revert-Add-best-as-default-behavior-RhBug16707761671683.patch new file mode 100644 index 0000000..88302db --- /dev/null +++ b/0001-Revert-Add-best-as-default-behavior-RhBug16707761671683.patch @@ -0,0 +1,35 @@ +From 9f9392c81dc493898dfab072cf0c7b1ae99df186 Mon Sep 17 00:00:00 2001 +From: Pavla Kratochvilova +Date: Wed, 13 Feb 2019 13:02:20 +0100 +Subject: [PATCH] Revert "Add best as default behavior (RhBug:1670776,1671683)" + +--- + doc/api_conf.rst | 2 +- + etc/dnf/dnf.conf | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/doc/api_conf.rst b/doc/api_conf.rst +index 9dd6a6a..f86e443 100644 +--- a/doc/api_conf.rst ++++ b/doc/api_conf.rst +@@ -30,7 +30,7 @@ Configurable settings of the :class:`dnf.Base` object are stored into a :class:` + + .. attribute:: best + +- Boolean option, ``True`` instructs the solver to either use a package with the highest available version or fail. On ``False``, do not fail if the latest version can not be installed. Default is ``True``. ++ Boolean option, ``True`` instructs the solver to either use a package with the highest available version or fail. On ``False``, do not fail if the latest version can not be installed. Default is ``False``. + + .. attribute:: cachedir + +diff --git a/etc/dnf/dnf.conf b/etc/dnf/dnf.conf +index 812c189..81b3e44 100644 +--- a/etc/dnf/dnf.conf ++++ b/etc/dnf/dnf.conf +@@ -2,4 +2,3 @@ + gpgcheck=1 + installonly_limit=3 + clean_requirements_on_remove=True +-best=True +-- +libgit2 0.27.7 + diff --git a/dnf.spec b/dnf.spec index a708ce9..59a693b 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,5 +1,5 @@ # default dependencies -%global hawkey_version 0.24.1 +%global hawkey_version 0.25.0 %global libcomps_version 0.1.8 %global libmodulemd_version 1.4.0 %global rpm_version 4.14.0 @@ -72,23 +72,25 @@ It supports RPMs, modules and comps groups & environments. Name: dnf -Version: 4.0.10 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: %{pkg_summary} # 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}.tar.gz +Patch0001: 0001-Revert-Add-best-as-default-behavior-RhBug16707761671683.patch BuildArch: noarch BuildRequires: cmake BuildRequires: gettext # Documentation -BuildRequires: %{_bindir}/sphinx-build BuildRequires: systemd BuildRequires: bash-completion %if %{with python3} +BuildRequires: %{_bindir}/sphinx-build-3 Requires: python3-%{name} = %{version}-%{release} %else +BuildRequires: %{_bindir}/sphinx-build Requires: python2-%{name} = %{version}-%{release} %endif %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -499,6 +501,13 @@ ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars %endif %changelog +* Wed Feb 13 2019 Pavla Kratochvilova - 4.1.0-1 +- Update to 4.1.0 +- Allow to enable modules that break default modules (RhBug:1648839) +- Enhance documentation - API examples +- Add --nobest option +- Revert commit that adds best as default behavior + * Thu Jan 31 2019 Fedora Release Engineering - 4.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 9660a4b..7413452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dnf-4.0.10.tar.gz) = 7bcc9c6be309b6461160ba4cb41847aaa0240e8cb97d2a59020865efca3f637bba53419e53b518fb156b014145a967ffae24694ae6dfc03751dd6032ef6b5736 +SHA512 (dnf-4.1.0.tar.gz) = 12d14055ed74dc98ee2d7e2d6e4531a87ba0fb6ee043e376c11ab0080e77a7b3e2f9f55c72d7022b3288d4f7d87b703a0ce50d297e11db9f47feec6ac149be19