rpms/PackageKit
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
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#fbe65f76976518534ebcb925396931f0b253aa1f
This commit is contained in:
DistroBaker 2021-02-09 14:39:05 +00:00
parent 65d617b2ba
commit 2d0bcd96e6
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-Fix-multilib-conflicts-in-generated-pk-enum-types.h.patch Normal file
View File

@ -0,0 +1,46 @@
From 36ecb04a711603f047c3d5a45194533833ec829b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 9 Feb 2021 15:02:51 +0100
Subject: [PATCH] Fix multilib conflicts in generated pk-enum-types.h
Avoid using full filename in comments as that can be different on
different arches if the build directory differs, leading to multilib
conflicts. Instead just use @basename@, which is always the same.
https://bugzilla.redhat.com/show_bug.cgi?id=1915259
---
lib/packagekit-glib2/pk-enum-types.c.template | 4 ++--
lib/packagekit-glib2/pk-enum-types.h.template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/packagekit-glib2/pk-enum-types.c.template b/lib/packagekit-glib2/pk-enum-types.c.template
index 683cbdaa8..d3db6e905 100644
--- a/lib/packagekit-glib2/pk-enum-types.c.template
+++ b/lib/packagekit-glib2/pk-enum-types.c.template
@@ -9,8 +9,8 @@
/*** END file-header ***/
/*** BEGIN file-production ***/
-#include "@filename@"
-/* enumerations from "@filename@" */
+#include "@basename@"
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
diff --git a/lib/packagekit-glib2/pk-enum-types.h.template b/lib/packagekit-glib2/pk-enum-types.h.template
index c42c9e5da..42aee7a3b 100644
--- a/lib/packagekit-glib2/pk-enum-types.h.template
+++ b/lib/packagekit-glib2/pk-enum-types.h.template
@@ -13,7 +13,7 @@ G_BEGIN_DECLS
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
--
2.29.2

9
PackageKit.spec
View File

@ -6,7 +6,7 @@
Summary: Package management service
Name: PackageKit
Version: 1.2.2
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.freedesktop.org/software/PackageKit/
Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
@ -22,6 +22,10 @@ Patch0: PackageKit-0.3.8-RHEL-Vendor.conf.patch
# https://github.com/hughsie/PackageKit/pull/437
Patch1: PackageKit-1.2.2-Do-not-crash-when-calling-pk_dbus_get_uid-before-D-Bus-is-setup.patch
# Fix multilib conflicts in generated pk-enum-types.h
# https://github.com/hughsie/PackageKit/pull/456
Patch2: 0001-Fix-multilib-conflicts-in-generated-pk-enum-types.h.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: xmlto
BuildRequires: gtk-doc
@ -240,6 +244,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
%{_datadir}/vala/vapi/packagekit-glib2.deps
%changelog
* Tue Feb 09 2021 Kalev Lember <klember@redhat.com> - 1.2.2-4
- Fix multilib conflicts in generated pk-enum-types.h (#1915259)
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild