diff --git a/.gitignore b/.gitignore index e610ed6..bb692f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/bubblewrap-0.1.7.tar.xz -SOURCES/rpm-ostree-2017.3.tar.xz +SOURCES/bubblewrap-0.1.8.tar.xz +SOURCES/rpm-ostree-2017.5.tar.xz diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata index 71dec28..9635c19 100644 --- a/.rpm-ostree.metadata +++ b/.rpm-ostree.metadata @@ -1,2 +1,2 @@ -a0058efeff906bc72cb5880d37b2553d8c5430d1 SOURCES/bubblewrap-0.1.7.tar.xz -9a5b2d0dff6c2a7265a0c061dc94a72fcb5a8c37 SOURCES/rpm-ostree-2017.3.tar.xz +dbb597b75848aa28daeaa7d4c933aadcb1a110dc SOURCES/bubblewrap-0.1.8.tar.xz +8c1db36bd4f23b32eed646541fe723b633a4b866 SOURCES/rpm-ostree-2017.5.tar.xz diff --git a/SOURCES/0001-Revert-reldep_from_str-add-support-for-rich-deps.patch b/SOURCES/0001-Revert-reldep_from_str-add-support-for-rich-deps.patch new file mode 100644 index 0000000..74b7cfa --- /dev/null +++ b/SOURCES/0001-Revert-reldep_from_str-add-support-for-rich-deps.patch @@ -0,0 +1,65 @@ +From 76e32ad40bb4cc27e13818be5c2acc4a70197c9e Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 2 May 2017 11:26:56 -0400 +Subject: [PATCH] Revert "reldep_from_str: add support for rich deps" + +This reverts commit 28017b4e2678f416f4a287da82382accd394d0d9. +--- + libdnf/libdnf/hy-iutil.c | 27 ++++++++------------------- + 1 file changed, 8 insertions(+), 19 deletions(-) + +diff --git a/libdnf/libdnf/hy-iutil.c b/libdnf/libdnf/hy-iutil.c +index 4031a15..f5c14b5 100644 +--- a/libdnf/libdnf/hy-iutil.c ++++ b/libdnf/libdnf/hy-iutil.c +@@ -40,7 +40,6 @@ + #include + #include + #include +-#include + + // glib + #include +@@ -52,7 +51,6 @@ + #include "hy-packageset-private.h" + #include "hy-query.h" + #include "dnf-sack-private.h" +-#include "dnf-reldep-private.h" + + #define BUF_BLOCK 4096 + #define CHKSUM_TYPE REPOKEY_TYPE_SHA256 +@@ -734,23 +732,14 @@ parse_reldep_str(const char *reldep_str, char **name, char **evr, + DnfReldep * + reldep_from_str(DnfSack *sack, const char *reldep_str) + { +- if (reldep_str[0] == '(') { +- /* Rich dependency */ +- Pool *pool = dnf_sack_get_pool (sack); +- Id id = pool_parserpmrichdep(pool, reldep_str); +- if (!id) +- return NULL; +- return dnf_reldep_from_pool (pool, id); +- } else { +- char *name, *evr = NULL; +- int cmp_type = 0; +- if (parse_reldep_str(reldep_str, &name, &evr, &cmp_type) == -1) +- return NULL; +- DnfReldep *reldep = dnf_reldep_new (sack, name, cmp_type, evr); +- g_free(name); +- g_free(evr); +- return reldep; +- } ++ char *name, *evr = NULL; ++ int cmp_type = 0; ++ if (parse_reldep_str(reldep_str, &name, &evr, &cmp_type) == -1) ++ return NULL; ++ DnfReldep *reldep = dnf_reldep_new (sack, name, cmp_type, evr); ++ g_free(name); ++ g_free(evr); ++ return reldep; + } + + DnfReldepList * +-- +2.12.2 + diff --git a/SOURCES/0001-Revert-selector-prefer-obsoletes-Related-RhBug-10965.patch b/SOURCES/0001-Revert-selector-prefer-obsoletes-Related-RhBug-10965.patch deleted file mode 100644 index 0d95162..0000000 --- a/SOURCES/0001-Revert-selector-prefer-obsoletes-Related-RhBug-10965.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff --git a/libdnf/data/tests/hawkey/greedy.repo b/libdnf/data/tests/hawkey/greedy.repo -index d450885..64bb85a 100644 ---- a/libdnf/data/tests/hawkey/greedy.repo -+++ b/libdnf/data/tests/hawkey/greedy.repo -@@ -5,7 +5,5 @@ - =Pkg: B 1 0 noarch - =Rec: C - =Prv: somereq --=Obs: somereq - =Pkg: C 1 0 noarch - =Prv: somereq --=Pkg: somereq 1 0 noarch -diff --git a/libdnf/libdnf/hy-goal.c b/libdnf/libdnf/hy-goal.c -index dc05c1c..3ff1ce6 100644 ---- a/libdnf/libdnf/hy-goal.c -+++ b/libdnf/libdnf/hy-goal.c -@@ -550,34 +550,6 @@ filter_name2job(DnfSack *sack, const struct _Filter *f, Queue *job) - return 0; - } - --/** -- * add_preferred_provide: -- * when searching by provides the packages that contain the same -- * name as provide or contain obsoletes with the same name as their -- * provide will be picked first -- */ --static void --add_preferred_provide(DnfSack *sack, Queue *job, Id id) --{ -- Pool *pool = dnf_sack_get_pool(sack); -- const char *name = pool_dep2str(pool, id); -- HyQuery q = hy_query_create(sack); -- hy_query_filter(q, HY_PKG_NAME, HY_NEQ, name); -- DnfPackageSet *pset = hy_query_run_set(q); -- hy_query_filter(q, HY_PKG_PROVIDES, HY_EQ, name); -- hy_query_filter_package_in(q, HY_PKG_OBSOLETES, HY_NEQ, pset); -- DnfPackage *pkg; -- g_autoptr(GPtrArray) plist = hy_query_run(q); -- for (guint i = 0; i < plist->len; i++) { -- pkg = g_ptr_array_index(plist, i); -- queue_push2(job, SOLVER_DISFAVOR|SOLVER_SOLVABLE, -- dnf_package_get_id(pkg)); -- } -- queue_push2(job, SOLVER_SOLVABLE_PROVIDES, id); -- hy_query_free(q); -- g_object_unref(pset); --} -- - static int - filter_provides2job(DnfSack *sack, const struct _Filter *f, Queue *job) - { -@@ -593,7 +565,7 @@ filter_provides2job(DnfSack *sack, const struct _Filter *f, Queue *job) - switch (f->cmp_type) { - case HY_EQ: - id = dnf_reldep_get_id (f->matches[0].reldep); -- add_preferred_provide(sack, job, id); -+ queue_push2(job, SOLVER_SOLVABLE_PROVIDES, id); - break; - case HY_GLOB: - dataiterator_init(&di, pool, 0, 0, SOLVABLE_PROVIDES, name, SEARCH_GLOB); -@@ -604,7 +576,7 @@ filter_provides2job(DnfSack *sack, const struct _Filter *f, Queue *job) - assert(di.idp); - id = *di.idp; - if (!job_has(job, SOLVABLE_PROVIDES, id)) -- add_preferred_provide(sack, job, id); -+ queue_push2(job, SOLVER_SOLVABLE_PROVIDES, id); - dataiterator_free(&di); - break; - default: -diff --git a/libdnf/tests/hawkey/test_goal.c b/libdnf/tests/hawkey/test_goal.c -index 7c30097..2a98983 100644 ---- a/libdnf/tests/hawkey/test_goal.c -+++ b/libdnf/tests/hawkey/test_goal.c -@@ -230,27 +230,6 @@ START_TEST(test_goal_install_selector) - } - END_TEST - --START_TEST(test_goal_install_selector_obsoletes_first) --{ -- HySelector sltr; -- HyGoal goal = hy_goal_create(test_globals.sack); -- -- sltr = hy_selector_create(test_globals.sack); -- hy_selector_set(sltr, HY_PKG_PROVIDES, HY_EQ, "somereq"); -- fail_if(!hy_goal_install_selector(goal, sltr, NULL)); -- hy_selector_free(sltr); -- -- fail_if(hy_goal_run(goal)); -- assert_iueo(goal, 1, 0, 0, 0); -- -- GPtrArray *plist = hy_goal_list_installs(goal, NULL); -- const char *nvra = dnf_package_get_nevra(g_ptr_array_index(plist, 0)); -- ck_assert_str_eq(nvra, "B-1-0.noarch"); -- g_ptr_array_unref(plist); -- hy_goal_free(goal); --} --END_TEST -- - START_TEST(test_goal_install_selector_err) - { - int rc; -@@ -1456,7 +1435,6 @@ goal_suite(void) - tc = tcase_create("Greedy"); - tcase_add_unchecked_fixture(tc, fixture_greedy_only, teardown); - tcase_add_test(tc, test_goal_run_all); -- tcase_add_test(tc, test_goal_install_selector_obsoletes_first); - tcase_add_test(tc, test_goal_install_weak_deps); - suite_add_tcase(s, tc); - diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index 5b48d8f..90675e0 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -1,8 +1,8 @@ -%global bubblewrap_version 0.1.7 +%global bubblewrap_version 0.1.8 Summary: Client side upgrade program and server side compose tool Name: rpm-ostree -Version: 2017.3 -Release: 2.atomic%{?dist} +Version: 2017.5 +Release: 1.atomic%{?dist} #VCS: https://github.com/cgwalters/rpm-ostree # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot" # because github doesn't support placing submodules in tarballs and RPM @@ -12,7 +12,7 @@ License: LGPLv2+ URL: https://github.com/projectatomic/rpm-ostree Source1: https://github.com/projectatomic/bubblewrap/releases/download/v%{bubblewrap_version}/bubblewrap-%{bubblewrap_version}.tar.xz -Patch1: 0001-Revert-selector-prefer-obsoletes-Related-RhBug-10965.patch +Patch1: 0001-Revert-reldep_from_str-add-support-for-rich-deps.patch Requires: ostree-fuse @@ -131,6 +131,10 @@ python autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Tue May 02 2017 Jonathan Lebon - 2017.5-1.atomic +- New upstream release +- Resolves: #1447070 + * Tue Mar 21 2017 Jonathan Lebon - 2017.3-2.atomic - Add BR on gobject-introspection-devel.