From 2db437a01ad0b3cc39e7c9ca49f9d17927d04c97 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Jan 23 2023 20:58:45 +0000
Subject: Update to 1.2.6


---

diff --git a/.gitignore b/.gitignore
index 6420245..f9d3ebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-1.2.3.tar.xz
 /PackageKit-1.2.4.tar.xz
 /PackageKit-1.2.5.tar.xz
+/PackageKit-1.2.6.tar.xz
diff --git a/505.patch b/505.patch
deleted file mode 100644
index ad1621a..0000000
--- a/505.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7c819714639fed3819b7f5b8ea3edd842e425feb Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Fri, 10 Sep 2021 09:53:14 +0200
-Subject: [PATCH] pk-engine: Always allow user interaction for offline
- update/upgrade
-
-This partly reverts commit 9b7e083cf849c4ed4d66fe32250f1615ab577d94.
-The offline update/upgrade triggers do need the user interaction, to
-get the credentials from the polkit, otherwise the trigger cannot
-do its job.
-
-Closes https://github.com/PackageKit/PackageKit/issues/504
----
- src/pk-engine.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pk-engine.c b/src/pk-engine.c
-index f4fe2805e..a8e9fef14 100644
---- a/src/pk-engine.c
-+++ b/src/pk-engine.c
-@@ -1616,7 +1616,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
- 		polkit_authority_check_authorization (engine->priv->authority, subject,
- 						      "org.freedesktop.packagekit.trigger-offline-update",
- 						      NULL,
--						      get_polkit_flags_for_dbus_invocation (invocation),
-+						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
- 						      NULL,
- 						      pk_engine_offline_helper_cb,
- 						      helper);
-@@ -1630,7 +1630,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
- 		polkit_authority_check_authorization (engine->priv->authority, subject,
- 						      "org.freedesktop.packagekit.clear-offline-update",
- 						      NULL,
--						      get_polkit_flags_for_dbus_invocation (invocation),
-+						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
- 						      NULL,
- 						      pk_engine_offline_helper_cb,
- 						      helper);
-@@ -1657,7 +1657,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
- 		polkit_authority_check_authorization (engine->priv->authority, subject,
- 						      "org.freedesktop.packagekit.trigger-offline-update",
- 						      NULL,
--						      get_polkit_flags_for_dbus_invocation (invocation),
-+						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
- 						      NULL,
- 						      pk_engine_offline_helper_cb,
- 						      helper);
-@@ -1684,7 +1684,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
- 		polkit_authority_check_authorization (engine->priv->authority, subject,
- 						      "org.freedesktop.packagekit.trigger-offline-upgrade",
- 						      NULL,
--						      get_polkit_flags_for_dbus_invocation (invocation),
-+						      POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
- 						      NULL,
- 						      pk_engine_offline_helper_cb,
- 						      helper);
diff --git a/PackageKit.spec b/PackageKit.spec
index 3226f9a..dec1dd1 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -3,7 +3,7 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   1.2.5
+Version:   1.2.6
 Release:   %autorelease
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
@@ -19,12 +19,6 @@ Patch0:    PackageKit-0.3.8-RHEL-Vendor.conf.patch
 # https://github.com/PackageKit/PackageKit/pull/404
 Patch1:    package-remove-password-prompt.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2002609
-# https://github.com/PackageKit/PackageKit/pull/505
-# This patch will likely not be merged as-is, but we agreed it is fine
-# as a downstream backport to address the bug urgently
-Patch2:    505.patch
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
 BuildRequires: gtk-doc
@@ -41,6 +35,7 @@ BuildRequires: pango-devel
 BuildRequires: fontconfig-devel
 BuildRequires: libappstream-glib-devel
 BuildRequires: libdnf-devel >= %{libdnf_version}
+BuildRequires: systemd
 BuildRequires: systemd-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: bash-completion
diff --git a/sources b/sources
index b83fedc..7438167 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PackageKit-1.2.5.tar.xz) = 582c5d4bab64f1a83c24bf66a4f3c74c87b23c7d59abe95b6e7427ec8de5baa6f4f0822c36e9731f737b94038e640da6fbcffda439b5a976643e7e3028e32e92
+SHA512 (PackageKit-1.2.6.tar.xz) = 0861c539e4427f0b5104dc54a9c9cd6c9311d245732290864dd602a0c5959fce028553c8f8ed38f5fd826e32b31c765710c76e282450b6590af0c49116f29bae