Hello community, here is the log from the commit of package libsatsolver for openSUSE:11.4 checked in at Sun Feb 27 12:52:22 CET 2011.
-------- --- old-versions/11.4/all/libsatsolver/libsatsolver.changes 2010-10-22 16:35:11.000000000 +0200 +++ 11.4/libsatsolver/libsatsolver.changes 2011-02-24 17:45:23.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 24 17:44:05 CET 2011 - [email protected] + +- ignore to be dropped orhaned packages when calculating + candidates for recommends/supplements installation + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- ignoreorphaned.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.fnAjJe/_old 2011-02-27 12:51:57.000000000 +0100 +++ /var/tmp/diff_new_pack.fnAjJe/_new 2011-02-27 12:51:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsatsolver (Version 0.16.1) +# spec file for package libsatsolver # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,11 @@ Name: libsatsolver Version: 0.16.1 -Release: 1 +Release: 4.<RELEASE2> License: BSD3c Url: git://git.opensuse.org/projects/zypp/sat-solver.git Source: satsolver-%{version}.tar.bz2 +Patch: ignoreorphaned.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ Prefix: /usr @@ -159,6 +160,7 @@ %prep %setup -n satsolver-%{version} +%patch %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ ignoreorphaned.diff ++++++ --- ./src/solver.c.orig 2010-10-22 13:57:56.000000000 +0000 +++ ./src/solver.c 2011-02-24 16:41:45.000000000 +0000 @@ -1722,6 +1722,8 @@ solver_run_sat(Solver *solv, int disable } else if (solv->decisionmap[p] == 0) { + if (solv->dupmap_all && solv->installed && pool->solvables[p].repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - solv->installed->start)))) + continue; queue_pushunique(&dq, p); } } @@ -1737,6 +1739,8 @@ solver_run_sat(Solver *solv, int disable continue; if (!solver_is_supplementing(solv, s)) continue; + if (solv->dupmap_all && solv->installed && s->repo == solv->installed && (solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, i - solv->installed->start)))) + continue; queue_push(&dqs, i); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
