ref: refs/heads/SuSE-Code-11-Branch commit 24b99610a185e92eb47f7bc5a163e1ea5794412f Author: Ján Kupec Date: Fri Sep 25 19:34:23 2009 +0200 changes & version & require new zypp & typo fix --- VERSION.cmake | 4 ++-- doc/zypper.8 | 2 +- package/zypper.changes | 6 ++++++ src/update.cc | 4 ++-- zypper.spec.cmake | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index a57fe65..5bfd462 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "11") +SET(VERSION_PATCH "12") -# LAST RELEASED: 1.0.11 +# LAST RELEASED: 1.0.12 #======= diff --git a/doc/zypper.8 b/doc/zypper.8 index bff2c4e..8150eb9 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "1.0.7" "zypper" "System Tools" +.TH "zypper" "8" "1.0.12" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] diff --git a/package/zypper.changes b/package/zypper.changes index df91aef..1c5a924 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 25 18:36:02 CEST 2009 - jkupec@suse.cz + +- Fixed incorrect selection of update candidate (bnc #539360) +- 1.0.12 + +------------------------------------------------------------------- Thu Sep 3 16:30:13 CEST 2009 - jkupec@suse.cz - Fixed wrong table column width computation causing excessive diff --git a/src/update.cc b/src/update.cc index 1c79ab1..fffda38 100755 --- a/src/update.cc +++ b/src/update.cc @@ -721,11 +721,11 @@ void mark_updates(Zypper & zypper, const ResKindSet & kinds, bool skip_interacti { ui::Selectable::Ptr s = *solvit; #if USE_THE_ONE - PoolItem theone = s.updateCandidateObj(); + PoolItem theone = s->updateCandidateObj(); // if there's no update candidate, then there must be an installed object // otherwise there would be no selectable of this name & kind if (!theone) - theone = s.installedObj(); + theone = s->installedObj(); #else PoolItem theone = findTheBest(God->pool(), *s); #endif diff --git a/zypper.spec.cmake b/zypper.spec.cmake index 6b8592b..95c1cf9 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 5.24.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 5.30.12 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org