From b22b751cb9cd5b36d04a7012592c2602662a7b08 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 6 Feb 2019 13:59:47 +0100 Subject: [PATCH] Don't override DnfContext's release_ver for the running system https://pagure.io/releng/issue/7445 --- ...de-DnfContext-s-release_ver-for-the-.patch | 45 +++++++++++++++++++ PackageKit.spec | 8 +++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch 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 new file mode 100644 index 0000000..b54b22a --- /dev/null +++ b/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 +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/PackageKit.spec b/PackageKit.spec index e3e8b14..8dc4bb1 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -14,7 +14,7 @@ Summary: Package management service Name: PackageKit Version: 1.1.12 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/PackageKit/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz @@ -37,6 +37,9 @@ Patch1: 0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch # 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 + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: xmlto BuildRequires: gtk-doc @@ -347,6 +350,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_datadir}/vala/vapi/packagekit-glib2.vapi %changelog +* Wed Jun 19 2019 Kalev Lember - 1.1.12-8 +- Don't override DnfContext's release_ver for the running system + * Mon Jun 10 22:13:21 CET 2019 Igor Gnatenko - 1.1.12-7 - Rebuild for RPM 4.15