diff --git a/.gitignore b/.gitignore index 917ccc7..a2b88d2 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /libdnf-0.22.0.tar.gz /libdnf-0.22.3.tar.gz /libdnf-0.24.1.tar.gz +/libdnf-0.26.0.tar.gz diff --git a/0001-Revert-9309e92332241ff1113433057c969cebf127734e.patch b/0001-Revert-9309e92332241ff1113433057c969cebf127734e.patch new file mode 100644 index 0000000..42fa3d1 --- /dev/null +++ b/0001-Revert-9309e92332241ff1113433057c969cebf127734e.patch @@ -0,0 +1,25 @@ +From 56286de885cfa5721a5d74b873df49238f324029 Mon Sep 17 00:00:00 2001 +From: Pavla Kratochvilova +Date: Wed, 13 Feb 2019 12:39:30 +0100 +Subject: [PATCH] Revert: 9309e92332241ff1113433057c969cebf127734e + +--- + libdnf/conf/ConfigMain.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdnf/conf/ConfigMain.cpp b/libdnf/conf/ConfigMain.cpp +index fc4ff01..50c640c 100644 +--- a/libdnf/conf/ConfigMain.cpp ++++ b/libdnf/conf/ConfigMain.cpp +@@ -210,7 +210,7 @@ class ConfigMain::Impl { + OptionSeconds metadata_timer_sync{60 * 60 * 3}; // 3 hours + OptionStringList disable_excludes{std::vector{}}; + OptionEnum multilib_policy{"best", {"best", "all"}}; // :api +- OptionBool best{true}; // :api ++ OptionBool best{false}; // :api + OptionBool install_weak_deps{true}; + OptionString bugtracker_url{BUGTRACKER}; + OptionBool zchunk{true}; +-- +libgit2 0.27.7 + diff --git a/libdnf.spec b/libdnf.spec index a15eb75..836e54d 100644 --- a/libdnf.spec +++ b/libdnf.spec @@ -1,6 +1,6 @@ %global libsolv_version 0.6.35-1 %global libmodulemd_version 1.6.1 -%global dnf_conflict 4.0.10 +%global dnf_conflict 4.1.0 %global swig_version 3.0.12 %bcond_with valgrind @@ -30,12 +30,13 @@ %{nil} Name: libdnf -Version: 0.24.1 -Release: 2%{?dist} +Version: 0.26.0 +Release: 1%{?dist} Summary: Library providing simplified C and Python API to libsolv License: LGPLv2+ URL: https://github.com/rpm-software-management/libdnf Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0001: 0001-Revert-9309e92332241ff1113433057c969cebf127734e.patch BuildRequires: cmake BuildRequires: gcc @@ -245,6 +246,12 @@ popd %endif %changelog +* Wed Feb 13 2019 Pavla Kratochvilova - 0.26.0-1 +- Update to 0.26.0-1 +- Enhance modular solver to handle enabled and default module streams differently (RhBug:1648839) +- Add support of wild cards for modules (RhBug:1644588) +- Revert commit that adds best as default behavior + * Fri Feb 01 2019 Fedora Release Engineering - 0.24.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index bbac4b2..aa222f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdnf-0.24.1.tar.gz) = 834fae305b0b7578c80c1748a10aaa5a15a0ba41a77d08e5ea93cd1bd5b92899c644fd69b14bd1c904bbbb77ac9e04aa6bff9b1bf3e85518df6f6a04b25aa391 +SHA512 (libdnf-0.26.0.tar.gz) = 62bfebf5b7c09a98cab957ee90da07a0a67d371449752af8e3f07e1f54d766fa1284f891f666f7de2dbca42670e116b3df30a514d74f84f5300db9e87cb3b91f