Hello community, here is the log from the commit of package libdnf for openSUSE:Factory checked in at 2020-08-23 09:21:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdnf (Old) and /work/SRC/openSUSE:Factory/.libdnf.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdnf" Sun Aug 23 09:21:10 2020 rev:17 rq:828393 version:0.48.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libdnf/libdnf.changes 2020-07-15 11:24:52.345587816 +0200 +++ /work/SRC/openSUSE:Factory/.libdnf.new.3399/libdnf.changes 2020-08-23 09:21:17.266688723 +0200 @@ -1,0 +2,7 @@ +Fri Aug 21 07:56:01 UTC 2020 - Neal Gompa <[email protected]> + +- Backport fix from upstream to fix building against check >= 0.15 + + Patch: 0001-tests-Fix-incorrect-usage-of-the-fail_unless-macro.patch +- Clean up spec comments about patches + +------------------------------------------------------------------- New: ---- 0001-tests-Fix-incorrect-usage-of-the-fail_unless-macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdnf.spec ++++++ --- /var/tmp/diff_new_pack.Kez7ir/_old 2020-08-23 09:21:18.406689355 +0200 +++ /var/tmp/diff_new_pack.Kez7ir/_new 2020-08-23 09:21:18.410689358 +0200 @@ -41,9 +41,15 @@ Url: https://github.com/rpm-software-management/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-OPENSUSE: Fix libdnf build with static libsolvext +# Backports from upstream +## Fix libdnf tests to build against check >= 0.15 +## From: https://github.com/rpm-software-management/libdnf/commit/4f3f747cdf3e5d7ab0dadc4f25bca56fb16ce923 +Patch0001: 0001-tests-Fix-incorrect-usage-of-the-fail_unless-macro.patch + +# openSUSE specific fixes +## Fix libdnf build with static libsolvext Patch1000: libdnf-0.48.0-with-static-libsolvext.patch -# PATCH-FIX-OPENSUSE: Switch default reposdir to /etc/dnf/repos.d +## Switch default reposdir to /etc/dnf/repos.d Patch1001: libdnf-0.39.1-Switch-default-reposdir-to-etc-dnf-repos.d.patch BuildRequires: cmake ++++++ 0001-tests-Fix-incorrect-usage-of-the-fail_unless-macro.patch ++++++ >From 4f3f747cdf3e5d7ab0dadc4f25bca56fb16ce923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= <[email protected]> Date: Thu, 6 Aug 2020 10:59:59 +0200 Subject: [PATCH] tests: Fix incorrect usage of the fail_unless macro --- tests/hawkey/test_query.cpp | 2 +- tests/hawkey/test_sack.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hawkey/test_query.cpp b/tests/hawkey/test_query.cpp index bf21e334..12c7733c 100644 --- a/tests/hawkey/test_query.cpp +++ b/tests/hawkey/test_query.cpp @@ -306,7 +306,7 @@ START_TEST(test_query_pkg) hy_query_filter(q, HY_PKG_NAME, HY_EQ, "jay"); pset = hy_query_run_set(q); hy_query_free(q); - fail_unless(dnf_packageset_count(pset), 2); + fail_unless(dnf_packageset_count(pset) == 2); // use hy_query_filter_package_in(): q = hy_query_create(test_globals.sack); diff --git a/tests/hawkey/test_sack.cpp b/tests/hawkey/test_sack.cpp index ba54602d..5eab83b3 100644 --- a/tests/hawkey/test_sack.cpp +++ b/tests/hawkey/test_sack.cpp @@ -83,7 +83,7 @@ START_TEST(test_list_arches) const char ** arches = dnf_sack_list_arches(sack); /* noarch, x86_64, athlon, i686, i586, i486, i386 */ - fail_unless(g_strv_length((gchar**)arches), 7); + fail_unless(g_strv_length((gchar**)arches) == 7); if (strcmp(arches[2], "athlon") == 0) { // Fedora, Mageia -- 2.26.2
