Accepting request 424168 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/424168
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PackageKit?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2016-09-05 19:14:51 +00:00 committed by Git OBS Bridge
commit 1005f97938
3 changed files with 70 additions and 2 deletions

View File

@ -68,6 +68,11 @@ Wed Jul 13 10:37:28 UTC 2016 - dimstar@opensuse.org
- Add trusted key of Kalev Lember (8F62AF74) to the keyring.
- Fix update-alternatives usage.
-------------------------------------------------------------------
Thu May 19 19:40:59 CEST 2016 - hpj@suse.com
- Update to GNOME 3.20.2 (FATE#318572).
-------------------------------------------------------------------
Wed May 18 09:12:12 UTC 2016 - zaitor@opensuse.org
@ -92,6 +97,11 @@ Fri Apr 29 13:40:11 UTC 2016 - zaitor@opensuse.org
- Point offline update/upgrade trigger to the prepared update.
- Unlink any existing offline update triggers before creating.
-------------------------------------------------------------------
Thu Apr 14 15:59:34 UTC 2016 - mgorse@suse.com
- Update to GNOME 3.20 Fate#318572
-------------------------------------------------------------------
Tue Feb 16 10:56:48 UTC 2016 - dimstar@opensuse.org
@ -370,6 +380,14 @@ Sat Oct 4 12:31:13 UTC 2014 - dimstar@opensuse.org
of all not removing the /system-update link, thus ending in a
loop.
-------------------------------------------------------------------
Fri Sep 19 12:23:59 UTC 2014 - fcrozat@suse.com
- Add patch
bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch:
ensure PackageKit asks to be restarted when restart_suggested is
part of the update flags. Patch by Roy Ley Mu (bnc#881245).
-------------------------------------------------------------------
Fri Sep 12 12:17:30 UTC 2014 - dimstar@opensuse.org
@ -494,7 +512,7 @@ Sun Jul 13 20:36:24 UTC 2014 - dimstar@opensuse.org
- When using 'pkcon install' assume arch filter.
-------------------------------------------------------------------
Fri Jun 6 14:58:02 CEST 2014 - hpj@suse.com
Fri Jun 6 13:09:41 CEST 2014 - hpj@suse.com
- Add PackageKit-zypp-filter-uninstalled-packages.patch. GStreamer
codec installation would prompt to install already installed
@ -521,7 +539,23 @@ Mon Jan 20 18:25:00 UTC 2014 - dimstar@opensuse.org
- Do not use the '…' character when talking to plymouth.
- Don't use the default main context in sync PkClient methods.
- Only scan .desktop files in the datadir.
- Drop PackageKit-dbus-interface-annotation.patch: fixed upstream.
- Drop PackageKit-dbus-interface-annotation.patch,
bsc#951592-zypp-Raise-priority-of-ZYPP-stack-updates-if-a-secur.patch,
and PackageKit-gstreamer1.patch: fixed upstream.
-------------------------------------------------------------------
Mon Jan 5 10:24:22 CET 2014 - ma@suse.com
- Add bsc#951592-zypp-Raise-priority-of-ZYPP-stack-updates-if-a-secur.patch:
zypp: Raise priority of ZYPP stack updates if a security patch
is shadowed. (bsc#951592)
-------------------------------------------------------------------
Sat Jan 4 08:42:16 UTC 2014 - fcrozat@suse.com
- Add PackageKit-gstreamer1.patch: Build against gstreamer 1.0, not
0.10.
-------------------------------------------------------------------
Tue Dec 24 19:56:08 UTC 2013 - dimstar@opensuse.org

View File

@ -40,6 +40,8 @@ Patch6: PackageKit-avoid-endless-loop-on-autoupdate.patch
Patch7: PackageKit-annotate-dbus-interface.patch
# PATCH-FIX-UPSTREAM 0001-zypp-Return-error-if-invalid-package-IDs-are-detecte.patch bsc#981011 gh#hughsie/PackageKit#148 -- Return error if invalid package IDs are detected; fixes segfault in some cases
Patch8: 0001-zypp-Return-error-if-invalid-package-IDs-are-detecte.patch
# PATCH-FIX-SLED bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch rlmu@suse.com -- gpk-update-viewer should restart after certain kind of update.
Patch9: bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch
BuildRequires: NetworkManager-devel
BuildRequires: automake
BuildRequires: fdupes
@ -228,6 +230,9 @@ This package provides the upstream default configuration for PackageKit.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%if !0%{?is_opensuse}
%patch9 -p1
%endif
translation-update-upstream
%build

View File

@ -0,0 +1,29 @@
Index: PackageKit-0.8.16/client/pk-console.c
===================================================================
--- PackageKit-0.8.16.orig/client/pk-console.c
+++ PackageKit-0.8.16/client/pk-console.c
@@ -893,6 +893,9 @@ pk_console_finished_cb (GObject *object,
if (restart == PK_RESTART_ENUM_SYSTEM) {
/* TRANSLATORS: a package needs to restart their system */
g_print ("%s\n", _("Please restart the computer to complete the update."));
+ } else if (restart == PK_RESTART_ENUM_APPLICATION) {
+ /* TRANSLATORS: a package needs to restart this application */
+ g_print ("%s\n", _("Please restart this application to complete the update."));
} else if (restart == PK_RESTART_ENUM_SESSION) {
/* TRANSLATORS: a package needs to restart the session */
g_print ("%s\n", _("Please logout and login to complete the update."));
Index: PackageKit-0.8.16/backends/zypp/pk-backend-zypp.cpp
===================================================================
--- PackageKit-0.8.16.orig/backends/zypp/pk-backend-zypp.cpp
+++ PackageKit-0.8.16/backends/zypp/pk-backend-zypp.cpp
@@ -1289,7 +1289,9 @@ zypp_check_restart (PkRestartEnum *resta
( patch->reloginSuggested () ||
patch->restartSuggested () ||
patch->rebootSuggested ()) ) {
- if (patch->reloginSuggested () || patch->restartSuggested ())
+ if (patch->restartSuggested ())
+ *restart = PK_RESTART_ENUM_APPLICATION;
+ if (patch->reloginSuggested ())
*restart = PK_RESTART_ENUM_SESSION;
if (patch->rebootSuggested ())
*restart = PK_RESTART_ENUM_SYSTEM;