Hello community, here is the log from the commit of package apper for openSUSE:13.1 checked in at 2013-10-29 11:03:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/apper (Old) and /work/SRC/openSUSE:13.1/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apper" Changes: -------- --- /work/SRC/openSUSE:13.1/apper/apper.changes 2013-10-19 16:48:16.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.apper.new/apper.changes 2013-10-29 11:03:13.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Oct 27 15:18:45 UTC 2013 - wba...@tmo.at + +- Added 0001-Fix-accept-multiple-licenses.diff: fix handling of + multiple licenses (bnc#847346, kde#326619) + +------------------------------------------------------------------- New: ---- 0001-Fix-accept-multiple-licenses.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.ClEE8q/_old 2013-10-29 11:03:13.000000000 +0100 +++ /var/tmp/diff_new_pack.ClEE8q/_new 2013-10-29 11:03:13.000000000 +0100 @@ -61,6 +61,8 @@ # setting proxy requires polkit permissions - for very little gain Patch103: apper-no-user-proxy.diff Patch104: apper-0.8.0-extra-defines.patch +# PATCH-FIX-UPSTREAM 0001-Fix-accept-multiple-licenses.diff bnc#847346, kde#326619 +Patch105: 0001-Fix-accept-multiple-licenses.diff Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-Qt-devel >= 0.8.8 @@ -127,6 +129,7 @@ %patch101 -p1 %patch103 -p1 %patch104 +%patch105 -p1 %build %cmake_kde4 -d build -- -DSCREENSHOT_PROVIDER=openSUSE ++++++ 0001-Fix-accept-multiple-licenses.diff ++++++ From: Wolfgang Bauer <wba...@tmo.at> Date: Sun, 27 Oct 2013 14:56:17 +0000 Subject: Fix accepting multiple license agreements X-Git-Url: http://quickgit.kde.org/?p=apper.git&a=commitdiff&h=91084eef8b999d04ef5b8cd6b140e2c4d8b942dd --- Fix accepting multiple license agreements This patch fixes the handling of more than one license agreement by setting d->handlingActionRequired = false in requeueTransaction(). Before, this was still true when entering slotEulaRequired() for the second license. That one was not shown therefore, but Apper aborted instead. BUG: 326619 --- --- a/libapper/PkTransaction.cpp +++ b/libapper/PkTransaction.cpp @@ -304,6 +304,11 @@ d->simulateModel->deleteLater(); d->simulateModel = 0; } + + // We are not handling any required action yet for the requeued transaction. + // Without this a second license agreement f.e. does not get shown, + // see http://bugs.kde.org/show_bug.cgi?id=326619 + d->handlingActionRequired = false; switch (d->originalRole) { case Transaction::RoleRemovePackages: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
