Accepting request 429126 from GNOME:Factory
resub_typo_fixed (forwarded request 428852 from dimstar) OBS-URL: https://build.opensuse.org/request/show/429126 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PackageKit?expand=0&rev=156
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3a9b595fd3
@ -1,69 +0,0 @@
|
||||
From 744da7ce30ec3ef1fc5e1a40a9ffab520315ab06 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Untz <vuntz@opensuse.org>
|
||||
Date: Tue, 26 Jul 2011 11:34:22 +0200
|
||||
Subject: [PATCH 1/9] Change the configuration of the cron script to a
|
||||
sysconfig-like config
|
||||
|
||||
---
|
||||
contrib/cron/packagekit-background | 43 +++++++++++++++++++++++++++---------
|
||||
1 file changed, 33 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/contrib/cron/packagekit-background b/contrib/cron/packagekit-background
|
||||
index e5b5c9b..783e2df 100644
|
||||
--- a/contrib/cron/packagekit-background
|
||||
+++ b/contrib/cron/packagekit-background
|
||||
@@ -1,18 +1,41 @@
|
||||
-# should we attempt to do this? (valid: yes|no)
|
||||
+## Path: System/Cron/PackageKit
|
||||
+## Description: Cron job to update the system daily with PackageKit
|
||||
+
|
||||
+## Type: yesno
|
||||
+## Default: no
|
||||
+#
|
||||
+# Run the cron job.
|
||||
+#
|
||||
ENABLED=no
|
||||
|
||||
-# don't install, just check (valid: yes|no)
|
||||
+## Type: yesno
|
||||
+## Default: no
|
||||
+#
|
||||
+# Check if updates are available, instead of installing.
|
||||
+#
|
||||
CHECK_ONLY=no
|
||||
|
||||
-# if MAILTO is set, the mail command is used to deliver PackageKit output
|
||||
-# by default MAILTO is unset, so crond mails the output by itself
|
||||
-#MAILTO=root
|
||||
+## Type: string
|
||||
+## Default: ""
|
||||
+#
|
||||
+# If MAILTO is set, the mail command is used to deliver PackageKit output.
|
||||
+# By default MAILTO is unset, so crond mails the output by itself.
|
||||
+#
|
||||
+MAILTO=""
|
||||
|
||||
-# you may set SYSTEM_NAME if you want your PackageKit emails tagged
|
||||
-# differently default is output of hostname command
|
||||
-#SYSTEM_NAME=""
|
||||
+## Type: string
|
||||
+## Default: ""
|
||||
+#
|
||||
+# You may set SYSTEM_NAME if you want your PackageKit emails tagged differently.
|
||||
+# Default is output of hostname command.
|
||||
+#
|
||||
+SYSTEM_NAME=""
|
||||
|
||||
-# update checks will sleep random time before contacting the servers to
|
||||
+## Type: integer
|
||||
+## Default: 3600
|
||||
+#
|
||||
+# Update checks will sleep random time before contacting the servers to
|
||||
# avoid hammering them with thousands of request at the same time - this
|
||||
-# is the maximum sleep time (in seconds) for the random wait period
|
||||
+# is the maximum sleep time (in seconds) for the random wait period.
|
||||
+#
|
||||
SLEEP_MAX=3600
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 90224f3cd99d8f2f4371f7ae9fb8f602e740838d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Andres <ma@suse.de>
|
||||
Date: Fri, 22 Jul 2016 09:17:51 +0200
|
||||
Subject: [PATCH] zypp: Return error if invalid package IDs are detected
|
||||
|
||||
---
|
||||
backends/zypp/pk-backend-zypp.cpp | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
|
||||
index 49282fb..96a8180 100644
|
||||
--- a/backends/zypp/pk-backend-zypp.cpp
|
||||
+++ b/backends/zypp/pk-backend-zypp.cpp
|
||||
@@ -2403,6 +2403,12 @@ backend_get_update_detail_thread (PkBackendJob *job, GVariant *params, gpointer
|
||||
for (uint i = 0; package_ids[i]; i++) {
|
||||
sat::Solvable solvable = zypp_get_package_by_id (package_ids[i]);
|
||||
MIL << package_ids[i] << " " << solvable << endl;
|
||||
+ if (!solvable) {
|
||||
+ // Previously stored package_id no longer matches any solvable.
|
||||
+ zypp_backend_finished_error (job, PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
|
||||
+ "couldn't find package");
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
Capabilities obs = solvable.obsoletes ();
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e8d42d1c49b58f9dba85dbb634bcdc986f5f478ef26d1f50a3453353cd33b841
|
||||
size 1417204
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJXh4h9AAoJEICFj6OPYq901QEP/AqcwfbRuX8bGb11n7paIS+M
|
||||
vqiv1RNW7XrPACyz+LslMQk6Zlp1CY+eFUPhIrVUclUHAVgrQ4W3e/AY00yDKV8R
|
||||
/5zUzfmxFAUiZiTxAm9rwPvB0rLdVQQGFDq3A66EjxXMmgMCJEprj9tOPzuwADV7
|
||||
WsyaftvaeABbv+AFJ7O4b1LUjUcmA5TtoocZgadg5nMOW+o5gsW1qFteC38fj7HN
|
||||
pnkKTJiE/gw+FStVCrRuHYKvRS4osX1mLUwtOSXmLQRdlexzAqpXzduHwYPaZfni
|
||||
RWNZZvZwNkXT5+G3mBLYenTn+meL1HCW85fXytnFWVUKXn1XE/8znJMlygKs+F7S
|
||||
qgMDbGTPj9sBZVVNscK4AXM85TE4Xvt3gm+vMv4aibOyVV8RoWyFK9j8O7tmIpC5
|
||||
oPEaEkVPH5aC3IeK/TdA5bCMnMR0WRnAKOB+Lzku1Xf+ApRF4wVI9Wd24vw1kZVO
|
||||
Z9D+AERK0nU54FPv2EXrqcgielNV4rzqRvnDD++4FFLiEMt34rVCT/LIpA2LZOkl
|
||||
cJU1kcoarIXgovzQm3FViULc6f/S3ox66FjmiaPiAnmXASWA/PDisGLilJOdzuQP
|
||||
kszsjPZfDOZ58TKElDW2mThseZpLNhPysGLpxJYH2Z7yyhv6rlS5B/R5cYr2Sox8
|
||||
H21K1LQYgj6O9OfQafDG
|
||||
=QKo4
|
||||
-----END PGP SIGNATURE-----
|
||||
3
PackageKit-1.1.4.tar.xz
Normal file
3
PackageKit-1.1.4.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0ae89f7c381b7def41960f690f7212cf80f7f6bfc9055ce8d0c84aa45f120cd9
|
||||
size 1424756
|
||||
10
PackageKit-1.1.4.tar.xz.asc
Normal file
10
PackageKit-1.1.4.tar.xz.asc
Normal file
@ -0,0 +1,10 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEcBAABAgAGBQJX4A8aAAoJEBesuo36lw4X97kIAKLQcJVfEEYUG8C1H/DeCZM4
|
||||
N9cf+xRvdjq2bv72qyFnzPhbSEnIECZBMvizmuOU1uIRtdnfGgZqHcP/o8tWtMI1
|
||||
9SWOyPKIjIksbLD1vGgQTHrDuvsNUwQfmksBPQTuYXUh45F/5LyJeNjBaYtHkiuc
|
||||
8a/dnO2NeDpzXL0dVyYf3WIQcv5JKdhj+v5AwiD40UvBcLi6Ry2iO8Ez0WcwC5Dj
|
||||
z0xrztHdVchxWY0rUqyiqvREUtd8pt2fs6vY9tQiiTl/5owH9lXKdzFMcECethLC
|
||||
ZY53nxxgRnzhwRqrG2bIrlO74EDTUY8N+erB4SCxligOr2vSC8mRe3lvpMFJHxk=
|
||||
=3lPq
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,25 +0,0 @@
|
||||
From a2f8be68442529ab7c9883d55631bcfb6395b86d Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Fri, 15 Jul 2016 13:17:57 +0200
|
||||
Subject: [PATCH] Annotate PreparedUpgrade DBus property for usage in
|
||||
PackageKit-Qt
|
||||
|
||||
---
|
||||
src/org.freedesktop.PackageKit.xml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/org.freedesktop.PackageKit.xml b/src/org.freedesktop.PackageKit.xml
|
||||
index ad0cb45..3fa1090 100644
|
||||
--- a/src/org.freedesktop.PackageKit.xml
|
||||
+++ b/src/org.freedesktop.PackageKit.xml
|
||||
@@ -556,6 +556,7 @@
|
||||
|
||||
<!--*********************************************************************-->
|
||||
<property name="PreparedUpgrade" type="a{sv}" access="read">
|
||||
+ <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: PackageKit-1.1.0/contrib/command-not-found/PackageKit.sh.in
|
||||
===================================================================
|
||||
--- PackageKit-1.1.0.orig/contrib/command-not-found/PackageKit.sh.in
|
||||
+++ PackageKit-1.1.0/contrib/command-not-found/PackageKit.sh.in
|
||||
@@ -14,7 +14,7 @@ command_not_found_handle () {
|
||||
[[ $- =~ i ]] || runcnf=0
|
||||
|
||||
# don't run if DBus isn't running
|
||||
- [[ ! -S /var/run/dbus/system_bus_socket ]] && runcnf=0
|
||||
+ [[ ! -S /run/dbus/system_bus_socket ]] && runcnf=0
|
||||
|
||||
# don't run if packagekitd doesn't exist in the _system_ root
|
||||
[[ ! -x '@LIBEXECDIR@/packagekitd' ]] && runcnf=0
|
||||
@ -1,3 +1,69 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 19 20:26:10 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 1.1.4:
|
||||
+ Backends:
|
||||
- aptcc:
|
||||
. Add get-files-local support.
|
||||
. Add support for pk_backend_get_details_local.
|
||||
. Add support for searching for relative paths.
|
||||
. Convert a few more loops to C++11 range for.
|
||||
. Drop DebFile helper class.
|
||||
. Fix locating package which a file list belongs to.
|
||||
. Fix NULL assertion warning.
|
||||
. Fix typo.
|
||||
. Install local files using APT API.
|
||||
. Update pk-matrix for GetDetailsLocal.
|
||||
. Use C++11 range for loops.
|
||||
. Use FindGrp instead of manual matching every package when
|
||||
resolving.
|
||||
- apt: Remove reference from pk-matrix.html.
|
||||
- dnf: Port from libhif to libdnf.
|
||||
- hif/dnf:
|
||||
. Fix a tiny memory leak when installing packages.
|
||||
. Fix a tiny memory leak when invalidating repo cache.
|
||||
- zypp:
|
||||
. Pass the patch "Application Restart Suggested" flag down
|
||||
to PK.
|
||||
. Return error if invalid package IDs are detected.
|
||||
+ New Features:
|
||||
- Add a new DNF backend.
|
||||
- Use GetFilesLocal in pkcon get-files if argument is a file.
|
||||
+ Bugfixes:
|
||||
- Add a new REPO_ALREADY_SET error enum and use it in backends.
|
||||
- Annotate PreparedUpgrade DBus property for usage in
|
||||
PackageKit-Qt.
|
||||
- Change the configuration of the cron script to a
|
||||
sysconfig-like config.
|
||||
- Do not try to exec plymouth if it is not installed.
|
||||
- Don't crash when emitting PropertiesChanged for NULL values.
|
||||
- Fix a leak in get_prepared_sack().
|
||||
- Fix a tiny memory leak on error path.
|
||||
- Fix a tiny memory leak when setting a proxy.
|
||||
- Fix "cache-age changed to -1" debug message (when cache-age
|
||||
is G_MAXUINT).
|
||||
- Fix two small memory leaks when processing signals from the
|
||||
daemon.
|
||||
- Fix updates and change code to aid in not breaking this again
|
||||
(gh#hughsie/PackageKit#149).
|
||||
- Fix various g_variant_get ^a&s leaks.
|
||||
- Invalidate PreparedUpgrade property when the prepared file
|
||||
changes.
|
||||
- Look for command-not-found dbus socket in /run instead of
|
||||
/var/run.
|
||||
- Remove declaration of non-existent
|
||||
pk_task_{get,set}_interactive().
|
||||
- Drop
|
||||
0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch,
|
||||
PackageKit-dbus-location.patch,
|
||||
PackageKit-annotate-dbus-interface.patch,
|
||||
0001-zypp-Return-error-if-invalid-package-IDs-are-detecte.patch
|
||||
and bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch:
|
||||
Fixed upstream.
|
||||
- Conditionally apply translations-update-upstream BuildRequires
|
||||
and macro for non-openSUSE only.
|
||||
- Stop passing V=1 to make, we do debugging locally.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 25 11:17:18 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
%define BUILD_CNF 0
|
||||
%define with_offline_updates 1
|
||||
Name: PackageKit
|
||||
Version: 1.1.3
|
||||
Version: 1.1.4
|
||||
Release: 0
|
||||
Summary: Simple software installation management software
|
||||
License: GPL-2.0+
|
||||
@ -30,18 +30,8 @@ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-
|
||||
Source1: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz.asc
|
||||
Source2: baselibs.conf
|
||||
Source99: PackageKit.keyring
|
||||
# PATCH-FEATURE-OPENSUSE 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch vuntz@opensuse.org -- Change the configuration of the cron script to a sysconfig-like config
|
||||
Patch1: 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch
|
||||
# PATCH-FIX-UPSTREAM PackageKit-dbus-location.patch bnc#829944 dimstar@opensuse.org -- Look for dbus socket in /run instead of /var/run. Sent to upstream.
|
||||
Patch3: PackageKit-dbus-location.patch
|
||||
# PATCH-FIX-UPSTREAM PackageKit-avoid-endless-loop-on-autoupdate.patch zaitor@opensuse.org -- Avoid a endless loop on autoupdates.
|
||||
Patch6: PackageKit-avoid-endless-loop-on-autoupdate.patch
|
||||
# PATCH-FIX-UPSTREAM PackageKit-annotate-dbus-interface.patch gh#hughsie/PackageKit#147 dimstar@opensuse.org -- Annotate new DBus interface, which is too complex for Qt
|
||||
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
|
||||
Patch0: PackageKit-avoid-endless-loop-on-autoupdate.patch
|
||||
BuildRequires: NetworkManager-devel
|
||||
BuildRequires: automake
|
||||
BuildRequires: fdupes
|
||||
@ -65,7 +55,9 @@ BuildRequires: python-devel
|
||||
# We need the %%mime_database_* macros
|
||||
BuildRequires: shared-mime-info
|
||||
BuildRequires: sqlite-devel
|
||||
%if !0%{?is_opensuse}
|
||||
BuildRequires: translation-update-upstream
|
||||
%endif
|
||||
BuildRequires: vala
|
||||
BuildRequires: pkgconfig(bash-completion) >= 2.0
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
@ -225,19 +217,15 @@ This package provides the upstream default configuration for PackageKit.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch0 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
%patch9 -p1
|
||||
%endif
|
||||
translation-update-upstream
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Needed due to the tarball being bootstrapped with autoconf 1.13.
|
||||
#autoreconf -fi
|
||||
%if !0%{?is_opensuse}
|
||||
export CFLAGS="%{optflags} -DSLE"
|
||||
%endif
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-zypp \
|
||||
@ -255,7 +243,7 @@ translation-update-upstream
|
||||
--disable-systemd-updates \
|
||||
%endif
|
||||
%{nil}
|
||||
make %{?_smp_mflags} V=1
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
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;
|
||||
Loading…
Reference in New Issue
Block a user