From 0d9984ebc1f91cd83d6e31aeb7899e598ca6f043 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 2 Sep 2008 10:20:04 +0000 Subject: [PATCH] - make it compile - bumb version, add changes --- VERSION.cmake | 2 +- package/libsatsolver.changes | 13 +++++++++++++ src/solver.c | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/VERSION.cmake b/VERSION.cmake index 5d630f3..f7a58ef 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "10") -SET(LIBSATSOLVER_PATCH "5") +SET(LIBSATSOLVER_PATCH "6") # last released 0.10.4 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 6747bde..0f38023 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Sep 2 12:17:03 CEST 2008 - mls@suse.de + +- make solver includes use "" instead of <>, fixes bnc#415920 +- implement otherproviders() +- make patches do nevr matching +- make patch conflicts work with multiversion +- new job commands, now combinded from job type and select type +- support for distupgrade mode +- make SOLVER_ERASE_SOLVABLE work +- also check obsoletes when disabling update rules +- 0.10.6 + +------------------------------------------------------------------- Fri Aug 22 18:04:12 CEST 2008 - dmacvicar@suse.de - add support for extensible metadata over primary + diff --git a/src/solver.c b/src/solver.c index 5e4079f..9970faf 100644 --- a/src/solver.c +++ b/src/solver.c @@ -1064,6 +1064,7 @@ makemultiversionconflict(Solver *solv, Id n, Id con) queue_push(&q, -n); FOR_PROVIDES(p, pp, sn->name) { + s = pool->solvables + p; if (s->name != sn->name || s->arch != sn->arch) continue; if (!MAPTST(&solv->noobsoletes, p)) -- 2.7.4