diff --git a/.gitignore b/.gitignore index c406df3..7894590 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-1.1.10.tar.xz /PackageKit-1.1.11.tar.xz /PackageKit-1.1.12.tar.xz +/PackageKit-1.1.13.tar.xz diff --git a/0001-Do-not-trigger-an-inotity-event-when-the-AppStream-X.patch b/0001-Do-not-trigger-an-inotity-event-when-the-AppStream-X.patch deleted file mode 100644 index 966147e..0000000 --- a/0001-Do-not-trigger-an-inotity-event-when-the-AppStream-X.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f3398f8e48203246d6346b5c7c4ec5ea065181e6 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 19 Jul 2019 15:01:49 +0100 -Subject: [PATCH] Do not trigger an inotity event when the AppStream XML data - is unchanged - -We already call dnf_utils_refresh_repo_appstream() on startup, but only as -required. Remove the unconditional copy to speed up gnome-software startup. ---- - backends/dnf/pk-backend-dnf.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c -index 779896c2d..503a6eb0a 100644 ---- a/backends/dnf/pk-backend-dnf.c -+++ b/backends/dnf/pk-backend-dnf.c -@@ -565,13 +565,6 @@ dnf_utils_add_remote (PkBackendJob *job, - if (!ret) - return FALSE; - -- /* update the AppStream copies in /var */ -- for (guint i = 0; i < repos->len; i++) { -- DnfRepo *repo = g_ptr_array_index (repos, i); -- if (!dnf_utils_refresh_repo_appstream (repo, error)) -- return FALSE; -- } -- - /* done */ - if (!dnf_state_done (state, error)) - return FALSE; --- -2.21.0 - diff --git a/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch b/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch deleted file mode 100644 index b54b22a..0000000 --- a/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From be075445cafd370abf1ad3e6e85f2baebef056cb Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Wed, 30 Jan 2019 15:37:21 +0100 -Subject: [PATCH] dnf: Don't override DnfContext's release_ver for the running - system - -Only override release_ver for the system upgrade DnfContext and leave it -at the default value for the default context. This makes -dnf_context_setup() automatically figure out the release_ver based on -the running system: it looks at various provides in rpmdb and finally -falls back to VERSION_ID from /etc/os-release. - -The goal here is to make it possible to adjust the value that gets -passed to librepo by changing system-release(releasever) provides in -fedora-release (which DnfContext correctly handles if we leave the -release_ver set to the default value). - -https://pagure.io/releng/issue/7445 ---- - backends/dnf/pk-backend-dnf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c -index 47e565915..779896c2d 100644 ---- a/backends/dnf/pk-backend-dnf.c -+++ b/backends/dnf/pk-backend-dnf.c -@@ -156,7 +156,6 @@ pk_backend_setup_dnf_context (DnfContext *context, GKeyFile *conf, const gchar * - dnf_context_set_repo_dir (context, repo_dir); - lock_dir = g_build_filename (destdir, "/var/run", NULL); - dnf_context_set_lock_dir (context, lock_dir); -- dnf_context_set_release_ver (context, release_ver); - dnf_context_set_rpm_verbosity (context, "info"); - - /* use this initial data if repos are not present */ -@@ -3401,6 +3400,7 @@ pk_backend_upgrade_system_thread (PkBackendJob *job, GVariant *params, gpointer - g_autoptr(DnfContext) context = NULL; - - context = dnf_context_new (); -+ dnf_context_set_release_ver (context, release_ver); - ret = pk_backend_setup_dnf_context (context, priv->conf, release_ver, &error); - if (!ret) { - g_debug ("failed to setup context: %s", error->message); --- -2.21.0 - diff --git a/0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch b/0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch deleted file mode 100644 index 794c8e0..0000000 --- a/0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cdbd27d699b51e37c533d07abd2f1ab26e11355c Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Tue, 18 Dec 2018 01:02:27 +0100 -Subject: [PATCH] dnf: Invalidate the sack cache after downloading new metadata - -This fixes first resolve() after refresh() to correctly return the new -data. - -https://bugzilla.redhat.com/show_bug.cgi?id=1642878 ---- - backends/dnf/pk-backend-dnf.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/backends/dnf/pk-backend-dnf.c b/backends/dnf/pk-backend-dnf.c -index 5961f1258..47e565915 100644 ---- a/backends/dnf/pk-backend-dnf.c -+++ b/backends/dnf/pk-backend-dnf.c -@@ -1568,6 +1568,7 @@ pk_backend_refresh_cache_thread (PkBackendJob *job, - gpointer user_data) - { - PkBackendDnfJobData *job_data = pk_backend_job_get_user_data (job); -+ PkBackend *backend = pk_backend_job_get_backend (job); - DnfRepo *repo; - DnfState *state_local; - DnfState *state_loop; -@@ -1699,6 +1700,9 @@ pk_backend_refresh_cache_thread (PkBackendJob *job, - return; - } - -+ /* invalidate the sack cache after downloading new metadata */ -+ pk_backend_sack_cache_invalidate (backend, "downloaded new metadata"); -+ - /* regenerate the libsolv metadata */ - state_local = dnf_state_get_child (job_data->state); - sack = dnf_utils_create_sack_for_filters (job, 0, --- -2.19.1 - diff --git a/0001-offline-update-Use-new-plymouth-system-upgrade-and-r.patch b/0001-offline-update-Use-new-plymouth-system-upgrade-and-r.patch deleted file mode 100644 index 1c9da3c..0000000 --- a/0001-offline-update-Use-new-plymouth-system-upgrade-and-r.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4b3f4913e50510eed5fbd3bc4cf94a49dec939ab Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Wed, 27 Feb 2019 10:08:50 +0100 -Subject: [PATCH] offline update: Use new plymouth "system-upgrade" and - "reboot" modes - -These landed in plymouth git yesterday to implement -https://wiki.gnome.org/Design/OS/BootProgress - -Using the new API conditionally is tricky as it's command line API; -enterprise distros that don't have new enough plymouth should probably -just revert this commit. ---- - client/pk-offline-update.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/client/pk-offline-update.c b/client/pk-offline-update.c -index 90ecacd06..6f6591427 100644 ---- a/client/pk-offline-update.c -+++ b/client/pk-offline-update.c -@@ -188,7 +188,7 @@ pk_offline_update_reboot (void) - - /* reboot using systemd */ - sd_journal_print (LOG_INFO, "rebooting"); -- pk_offline_update_set_plymouth_mode ("shutdown"); -+ pk_offline_update_set_plymouth_mode ("reboot"); - /* TRANSLATORS: we've finished doing offline updates */ - pk_offline_update_set_plymouth_msg (_("Rebooting after installing updates…")); - connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -@@ -371,6 +371,7 @@ pk_offline_update_do_update (PkTask *task, PkProgressBar *progressbar, GError ** - return FALSE; - } - -+ pk_offline_update_set_plymouth_mode ("updates"); - /* TRANSLATORS: we've started doing offline updates */ - pk_offline_update_set_plymouth_msg (_("Installing updates; this could take a while...")); - pk_offline_update_write_dummy_results (); -@@ -403,6 +404,7 @@ pk_offline_update_do_upgrade (PkTask *task, PkProgressBar *progressbar, GError * - return FALSE; - } - -+ pk_offline_update_set_plymouth_mode ("system-upgrade"); - /* TRANSLATORS: we've started doing offline system upgrade */ - pk_offline_update_set_plymouth_msg (_("Installing system upgrade; this could take a while...")); - pk_offline_update_write_dummy_results (); -@@ -485,7 +487,6 @@ main (int argc, char *argv[]) - - task = pk_task_new (); - pk_client_set_interactive (PK_CLIENT (task), FALSE); -- pk_offline_update_set_plymouth_mode ("updates"); - - if (g_strcmp0 (link, PK_OFFLINE_PREPARED_UPGRADE_FILENAME) == 0 && - g_file_test (PK_OFFLINE_PREPARED_UPGRADE_FILENAME, G_FILE_TEST_EXISTS)) { --- -2.21.0 - diff --git a/PackageKit.spec b/PackageKit.spec index 0bf9628..973992b 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -13,8 +13,8 @@ Summary: Package management service Name: PackageKit -Version: 1.1.12 -Release: 12%{?dist} +Version: 1.1.13 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/PackageKit/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz @@ -30,19 +30,6 @@ Provides: bundled(libdnf) = 0.7.0 # Fedora-specific: set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch -# Backported from upstream -Patch1: 0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch - -# Use new plymouth "system-upgrade" and "reboot" modes -# https://github.com/hughsie/PackageKit/pull/316 -Patch2: 0001-offline-update-Use-new-plymouth-system-upgrade-and-r.patch - -# https://pagure.io/releng/issue/7445 -Patch3: 0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch - -# https://github.com/hughsie/PackageKit/pull/330 -Patch4: 0001-Do-not-trigger-an-inotity-event-when-the-AppStream-X.patch - BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: xmlto BuildRequires: gtk-doc @@ -343,6 +330,16 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_datadir}/vala/vapi/packagekit-glib2.vapi %changelog +* Wed Jan 08 2020 Richard Hughes - 1.1.13-1 +- New upstream release +- Don't use a bash regex to fix command not found on other shells +- Keep a ref on transaction while doing async polkit call +- Properly mark obsoleted packages when simulating upgrade +- Return directly when its state is going backwards +- Shrink the progress bar to fit when run in small spaces +- Support non-x86 arches in gstreamer helper +- zsh command not found should return the same as its bash equivalent + * Tue Aug 13 2019 Richard Hughes - 1.1.12-12 - Fix rpmdb permission of transaction database file diff --git a/sources b/sources index 665fe02..3b72133 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PackageKit-1.1.12.tar.xz) = a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b +SHA512 (PackageKit-1.1.13.tar.xz) = b15f78841c6329ef269824d27a626f8d01c6b77d1fc506b3cc5f80c0ae1477a9c3f292233f64320c1e84aa4b872f08c960afa83e56156a06cedb7f5ec41d0d0c