2d0bcd96e6
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
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
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
|
|
|