From e5751afdfd234364a7b4c7d8bfd99f0430c0db9e Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 2 Nov 2020 11:43:38 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/PackageKit.git#e4c0ae6dce26a3ac250e469add76bf4018456aca
---
 .gitignore                              |  1 +
 PackageKit-0.3.8-RHEL-Vendor.conf.patch | 45 +++++++++++++++++++++++++
 PackageKit.spec                         | 13 +++++--
 sources                                 |  2 +-
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 PackageKit-0.3.8-RHEL-Vendor.conf.patch

diff --git a/.gitignore b/.gitignore
index 492fc80..b63980e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-1.1.13.tar.xz
 /PackageKit-1.2.0.tar.xz
 /PackageKit-1.2.1.tar.xz
+/PackageKit-1.2.2.tar.xz
diff --git a/PackageKit-0.3.8-RHEL-Vendor.conf.patch b/PackageKit-0.3.8-RHEL-Vendor.conf.patch
new file mode 100644
index 0000000..5eaec51
--- /dev/null
+++ b/PackageKit-0.3.8-RHEL-Vendor.conf.patch
@@ -0,0 +1,45 @@
+diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.conf
+--- PackageKit-0.8.14.old/etc/Vendor.conf	2013-12-02 15:14:19.644838900 +0000
++++ PackageKit-0.8.14/etc/Vendor.conf	2013-12-02 15:15:26.956925038 +0000
+@@ -12,7 +12,7 @@
+ # If the value is set to 'none' then no link is shown.
+ #
+ # default=http://www.packagekit.org/pk-package-not-found.html
+-DefaultUrl=http://www.packagekit.org/pk-package-not-found.html
++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
+@@ -21,7 +21,7 @@ DefaultUrl=http://www.packagekit.org/pk-
+ # If the value is set to 'none' then the value of DefaultUrl is used.
+ #
+ # default=none
+-CodecUrl=none
++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
+@@ -30,7 +30,7 @@ CodecUrl=none
+ # If the value is set to 'none' then the value of DefaultUrl is used.
+ #
+ # default=none
+-HardwareUrl=none
++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.
+@@ -38,7 +38,7 @@ HardwareUrl=none
+ # If the value is set to 'none' then the value of DefaultUrl is used.
+ #
+ # default=none
+-FontUrl=none
++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
+@@ -47,4 +47,4 @@ FontUrl=none
+ # If the value is set to 'none' then the value of DefaultUrl is used.
+ #
+ # default=none
+-MimeUrl=none
++MimeUrl=https://access.redhat.com/site/solutions/537113#Missing_MIME_Support
diff --git a/PackageKit.spec b/PackageKit.spec
index 0618450..aaa8cf8 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -5,14 +5,17 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   1.2.1
+Version:   1.2.2
 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
 
-# Fedora-specific: set Vendor.conf up for Fedora.
+%if 0%{?fedora}
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
+%elif 0%{?rhel}
+Patch0:    PackageKit-0.3.8-RHEL-Vendor.conf.patch
+%endif
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
@@ -182,6 +185,7 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/polkit-1/rules.d/*
 %{_datadir}/PackageKit/pk-upgrade-distro.sh
+%{_datadir}/PackageKit/helpers/test_spawn/search-name.sh
 %{_libexecdir}/packagekitd
 %{_libexecdir}/packagekit-direct
 %{_bindir}/pkmon
@@ -231,6 +235,11 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/vala/vapi/packagekit-glib2.deps
 
 %changelog
+* Mon Nov 02 2020 Richard Hughes <rhughes@redhat.com> - 1.2.2-1
+- New upstream release
+- Notify systemd when beginning to shutdown
+- Fix possible information disclosure
+
 * Mon Sep 07 2020 Richard Hughes <rhughes@redhat.com> - 1.2.1-1
 - New upstream release
 - Actually merge in the PolicyKit translation
diff --git a/sources b/sources
index 69d73dc..2b47b2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PackageKit-1.2.1.tar.xz) = 316d1bca80045d475a4d1089a351e9ae5e849e79e9576215550faf1e2e1ea160eafb29a0a695fe49d1eb6378563de6266740501f312db1010ea6f71652d31467
+SHA512 (PackageKit-1.2.2.tar.xz) = ee83647cacadadd35cc67ceb10d5aec28f4af3f02343422633f58a4361be86a33be6183d63333b015e067be493c98f36aa685a4c48f53c7cc4047f3651264081