From 065ece07bccc28a9766d6966789b697c70fbd1c0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 05 2019 19:42:38 +0000
Subject: import PackageKit-1.1.12-3.el8


---

diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch b/SOURCES/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch
new file mode 100644
index 0000000..b54b22a
--- /dev/null
+++ b/SOURCES/0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch
@@ -0,0 +1,45 @@
+From be075445cafd370abf1ad3e6e85f2baebef056cb Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+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/SPECS/PackageKit.spec b/SPECS/PackageKit.spec
index b27021a..60ce492 100644
--- a/SPECS/PackageKit.spec
+++ b/SPECS/PackageKit.spec
@@ -14,7 +14,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   1.1.12
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
@@ -32,6 +32,7 @@ Patch0:    PackageKit-0.3.8-Fedora-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
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
@@ -333,8 +334,8 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/vala/vapi/packagekit-glib2.vapi
 
 %changelog
-* Tue May 07 2019 CentOS Sources <bugs@centos.org> - 1.1.12-2.el8.centos
-- Apply debranding changes
+* Wed May 29 2019 Kalev Lember <klember@redhat.com> - 1.1.12-3
+- Backport a patch to improve release_ver handling (#1714439)
 
 * Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 1.1.12-2
 - Invalidate the sack cache after downloading new metadata