import PackageKit-1.1.12-6.el8

SOURCES/revert-shutdown-on-idle.patch

@@ -0,0 +1,41 @@
+From c9c13747e575fe2ce398cec200284d0318aaece3 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Wed, 29 Apr 2020 13:44:41 -0500
+Subject: [PATCH] Revert "Shutdown the daemon on idle by default"
+
+This reverts commit 0c84d71509e851db20445c747529bd7d3724f081.
+
+This broke the end session dialog in GNOME Shell.
+
+I thought I had that fixed by changing GNOME Shell to autostart
+PackageKit when it is not already running:
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1104
+
+But turns out, there are more problems. The update fails if the user has
+used dnf since PackageKit last quit, a scenario I did not test. It also
+results in GNOME Software getting confused about what software is
+installed and what software is not. The issues are discussed here:
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1227#note_784327
+
+It's still desirable to shut down automatically, but it requires more
+planning. And shutting down GNOME Software itself is frankly more
+important, since it uses a lot more RAM than packagekitd.
+---
+ src/pk-main.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/pk-main.c b/src/pk-main.c
+index 7a0bbd199..5791c5fef 100644
+--- a/src/pk-main.c
++++ b/src/pk-main.c
+@@ -178,8 +178,6 @@ main (int argc, char *argv[])
+ 
+ 	/* after how long do we timeout? */
+ 	exit_idle_time = g_key_file_get_integer (conf, "Daemon", "ShutdownTimeout", NULL);
+-	if (exit_idle_time == 0)
+-		exit_idle_time = 300;
+ 	g_debug ("daemon shutdown set to %i seconds", exit_idle_time);
+ 
+ 	/* override the backend name */

SOURCES/rhel-Vendor.conf.patch

@@ -6,7 +6,7 @@ diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.co
  #
  # default=http://www.packagekit.org/pk-package-not-found.html
 -DefaultUrl=http://www.packagekit.org/pk-package-not-found.html
-+DefaultUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Package
++DefaultUrl=https://access.redhat.com/site/solutions/537113#Missing_Package
  
  # The URL which is shown to the user when a codec could not be found.
  # It should explain why certain codecs cannot be used, and perhaps show
@@ -15,7 +15,7 @@ diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.co
  #
  # default=none
 -CodecUrl=none
-+CodecUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Codec
++CodecUrl=https://access.redhat.com/site/solutions/537113#Missing_Codec
  
  # The URL which is shown to the user when hardware drivers could not be found.
  # It should explain why some hardware is not supported, and links to futher
@@ -24,7 +24,7 @@ diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.co
  #
  # default=none
 -HardwareUrl=none
-+HardwareUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Driver
++HardwareUrl=https://access.redhat.com/site/solutions/537113#Missing_Driver
  
  # The URL which is shown to the user when fonts could not be found.
  # Alternatives should probably be suggested where possible.
@@ -33,7 +33,7 @@ diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.co
  #
  # default=none
 -FontUrl=none
-+FontUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Font
++FontUrl=https://access.redhat.com/site/solutions/537113#Missing_Font
  
  # The URL which is shown to the user when programs handing a mime tpye could not
  # be found. It should probably explain how to use wine if the program is a
@@ -42,4 +42,4 @@ diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.co
  #
  # default=none
 -MimeUrl=none
-+MimeUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_MIME_Support
++MimeUrl=https://access.redhat.com/site/solutions/537113#Missing_MIME_Support

SPECS/PackageKit.spec

@@ -14,7 +14,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   1.1.12
-Release:   4%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
@@ -27,14 +27,17 @@ Source1: https://github.com/rpm-software-management/libdnf/archive/%{commit1}/li
 Provides: bundled(libdnf) = 0.7.0
 %endif
 
-# Fedora-specific: set Vendor.conf up for Fedora.
-Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
+# RHEL-specific: set Vendor.conf up for RHEL.
+Patch0:    rhel-Vendor.conf.patch
 
 # Backported from upstream
 Patch1:    0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch
 Patch2:    0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch
 Patch3:    0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1814820
+Patch4:    revert-shutdown-on-idle.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
 BuildRequires: gtk-doc
@@ -335,6 +338,14 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/vala/vapi/packagekit-glib2.vapi
 
 %changelog
+* Fri May 22 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 1.1.12-6
+- Fix documentation links in Vendor.conf
+- Resolves: #1837648
+
+* Tue May 19 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 1.1.12-5
+- Do not shutdown the daemon on idle
+- Resolves: #1814820
+
 * Mon Nov 25 2019 Richard Hughes <rhughes@redhat.com> - 1.1.12-4
 - Do not use a bash regex to fix CNF on shells other than bash
 - Resolves: #1728855