Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2015-10-19 22:15:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsolv" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2015-09-27 08:38:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2015-10-19 22:15:10.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 5 13:27:25 CEST 2015 - [email protected] + +- fix bug in recommends handling [bnc#948482] +- also check installed packages in multiversion handling +- fix build on Mageia +- bump version to 0.6.14 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.13.tar.bz2 New: ---- libsolv-0.6.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.TZZ7ez/_old 2015-10-19 22:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.TZZ7ez/_new 2015-10-19 22:15:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.13 +Version: 0.6.14 Release: 0 Url: https://github.com/openSUSE/libsolv Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.13.tar.bz2 -> libsolv-0.6.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/VERSION.cmake new/libsolv-0.6.14/VERSION.cmake --- old/libsolv-0.6.13/VERSION.cmake 2015-09-25 12:00:28.000000000 +0200 +++ new/libsolv-0.6.14/VERSION.cmake 2015-10-05 13:35:27.000000000 +0200 @@ -49,5 +49,5 @@ SET(LIBSOLV_MAJOR "0") SET(LIBSOLV_MINOR "6") -SET(LIBSOLV_PATCH "13") +SET(LIBSOLV_PATCH "14") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/bindings/perl/CMakeLists.txt new/libsolv-0.6.14/bindings/perl/CMakeLists.txt --- old/libsolv-0.6.13/bindings/perl/CMakeLists.txt 2015-07-06 11:05:04.000000000 +0200 +++ new/libsolv-0.6.14/bindings/perl/CMakeLists.txt 2015-10-05 13:15:27.000000000 +0200 @@ -28,7 +28,7 @@ LINK_DIRECTORIES (${PERL_CORE_DIR}) INCLUDE_DIRECTORIES (${PERL_INCLUDE_PATH} ${PERL_CORE_DIR}) -ADD_LIBRARY (bindings_perl SHARED solv_perl.c) +ADD_LIBRARY (bindings_perl MODULE solv_perl.c) SET_TARGET_PROPERTIES (bindings_perl PROPERTIES PREFIX "" OUTPUT_NAME "solv") SET_TARGET_PROPERTIES (bindings_perl PROPERTIES LINK_FLAGS "${PERL_CCLDFLAGS}") TARGET_LINK_LIBRARIES (bindings_perl libsolvext libsolv ${SYSTEM_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/bindings/python/CMakeLists.txt new/libsolv-0.6.14/bindings/python/CMakeLists.txt --- old/libsolv-0.6.13/bindings/python/CMakeLists.txt 2015-08-04 14:35:29.000000000 +0200 +++ new/libsolv-0.6.14/bindings/python/CMakeLists.txt 2015-10-05 13:15:27.000000000 +0200 @@ -24,7 +24,7 @@ ADD_DEFINITIONS(-Wno-unused) INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) -ADD_LIBRARY (bindings_python SHARED solv_python.c) +ADD_LIBRARY (bindings_python MODULE solv_python.c) SET_TARGET_PROPERTIES (bindings_python PROPERTIES PREFIX "" OUTPUT_NAME "_solv") TARGET_LINK_LIBRARIES (bindings_python libsolvext libsolv ${SYSTEM_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/bindings/ruby/CMakeLists.txt new/libsolv-0.6.14/bindings/ruby/CMakeLists.txt --- old/libsolv-0.6.13/bindings/ruby/CMakeLists.txt 2015-07-06 11:05:04.000000000 +0200 +++ new/libsolv-0.6.14/bindings/ruby/CMakeLists.txt 2015-10-05 13:15:27.000000000 +0200 @@ -19,7 +19,7 @@ ADD_DEFINITIONS(-Wno-unused) INCLUDE_DIRECTORIES (${RUBY_INCLUDE_PATH}) -ADD_LIBRARY (bindings_ruby SHARED solv_ruby.c) +ADD_LIBRARY (bindings_ruby MODULE solv_ruby.c) SET_TARGET_PROPERTIES (bindings_ruby PROPERTIES PREFIX "" OUTPUT_NAME "solv") TARGET_LINK_LIBRARIES (bindings_ruby libsolvext libsolv ${SYSTEM_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/examples/solv/solv.c new/libsolv-0.6.14/examples/solv/solv.c --- old/libsolv-0.6.13/examples/solv/solv.c 2015-09-14 15:30:27.000000000 +0200 +++ new/libsolv-0.6.14/examples/solv/solv.c 2015-10-05 11:50:28.000000000 +0200 @@ -661,7 +661,7 @@ queue_push2(&job, SOLVER_ERASE|SOLVER_CLEANDEPS|SOLVER_SOLVABLE_PROVIDES, pool_rel2id(pool, NAMESPACE_LANGUAGE, 0, REL_NAMESPACE, 1)); #endif -#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA)) +#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA) || defined(MANDRIVA) || defined(MAGEIA)) rerunsolver: #endif solv = solver_create(pool); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/examples/tclsolv new/libsolv-0.6.14/examples/tclsolv --- old/libsolv-0.6.13/examples/tclsolv 2015-08-28 15:45:29.000000000 +0200 +++ new/libsolv-0.6.14/examples/tclsolv 2015-10-02 12:10:29.000000000 +0200 @@ -738,7 +738,7 @@ set cltype [$cl cget -type] if {$cltype == $solv::Transaction_SOLVER_TRANSACTION_UPGRADED || $cltype ==$solv::Transaction_SOLVER_TRANSACTION_DOWNGRADED} { set op [$trans othersolvable $p] - puts [format { - %s -> %s} [$p str] [$p str]] + puts [format { - %s -> %s} [$p str] [$op str]] } else { puts [format { - %s} [$p str]] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/package/libsolv.changes new/libsolv-0.6.14/package/libsolv.changes --- old/libsolv-0.6.13/package/libsolv.changes 2015-09-25 12:00:28.000000000 +0200 +++ new/libsolv-0.6.14/package/libsolv.changes 2015-10-05 13:35:27.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 5 13:27:25 CEST 2015 - [email protected] + +- fix bug in recommends handling [bnc#948482] +- also check installed packages in multiversion handling +- fix build on Mageia +- bump version to 0.6.14 + +------------------------------------------------------------------- Fri Sep 25 11:54:02 CEST 2015 - [email protected] - support a generic string for pattern-visible() [bnc#900769] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/src/rules.c new/libsolv-0.6.14/src/rules.c --- old/libsolv-0.6.13/src/rules.c 2015-08-25 12:50:27.000000000 +0200 +++ new/libsolv-0.6.14/src/rules.c 2015-09-30 13:45:27.000000000 +0200 @@ -928,7 +928,13 @@ /* we still obsolete packages with same nevra, like rpm does */ /* (actually, rpm mixes those packages. yuck...) */ if (multi && (s->name != ps->name || s->evr != ps->evr || s->arch != ps->arch)) - continue; + { + if (isinstalled || ps->repo != installed) + continue; + /* also check the installed package for multi-ness */ + if (MAPTST(&solv->multiversion, p)) + continue; + } if (!pool->implicitobsoleteusesprovides && s->name != ps->name) continue; if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps)) @@ -938,7 +944,7 @@ if (s->name == ps->name) { /* optimization: do not add the same-name conflict rule if it was - * already added when we looket at the other package. + * already added when we looked at the other package. * (this assumes pool_colormatch is symmetric) */ if (p && m && ps->repo != installed && MAPTST(m, p) && (ps->arch != ARCH_SRC && ps->arch != ARCH_NOSRC) && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/src/solver.c new/libsolv-0.6.14/src/solver.c --- old/libsolv-0.6.13/src/solver.c 2015-09-21 13:50:30.000000000 +0200 +++ new/libsolv-0.6.14/src/solver.c 2015-10-02 14:10:29.000000000 +0200 @@ -2544,13 +2544,20 @@ continue; if (solv->decisionmap[p] <= 0) continue; - if (solv->multiversion.size && MAPTST(&solv->multiversion, p)) + if (!solv->keepexplicitobsoletes && solv->multiversion.size && MAPTST(&solv->multiversion, p)) continue; obsp = s->repo->idarraydata + s->obsoletes; /* foreach obsoletes */ while ((obs = *obsp++) != 0) FOR_PROVIDES(po, ppo, obs) - MAPSET(&obsmap, po); + { + Solvable *pos = pool->solvables + po; + if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, pos, obs)) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s, pos)) + continue; + MAPSET(&obsmap, po); + } } for (i = j = 0; i < dqs.count; i++) if (!MAPTST(&obsmap, dqs.elements[i])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.13/tools/testsolv.c new/libsolv-0.6.14/tools/testsolv.c --- old/libsolv-0.6.13/tools/testsolv.c 2015-08-25 14:05:27.000000000 +0200 +++ new/libsolv-0.6.14/tools/testsolv.c 2015-10-05 11:50:28.000000000 +0200 @@ -25,7 +25,7 @@ }; static void -usage(ex) +usage(int ex) { fprintf(ex ? stderr : stdout, "Usage: testsolv <testcase>\n"); exit(ex);
