Add patch to fix 32-bit compilation

This commit is contained in:
Jonathan Lebon 2019-09-25 12:51:20 -04:00
parent 5e9b924d28
commit f20dae4e0a
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,35 @@
From 08c98eda94381f0147af5783960121574043fa5a Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 25 Sep 2019 12:42:59 -0400
Subject: [PATCH] app/status: Fix printf format string for 32-bit
Hit this when compiling in Koji.
---
src/app/rpmostree-builtin-status.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
index 2bc2c4b5..8b38fc83 100644
--- a/src/app/rpmostree-builtin-status.c
+++ b/src/app/rpmostree-builtin-status.c
@@ -1119,7 +1119,7 @@ fetch_history_deployment_gvariant (RORHistoryEntry *entry,
GError **error)
{
g_autofree char *fn =
- g_strdup_printf ("%s/%lu", RPMOSTREE_HISTORY_DIR, entry->deploy_timestamp);
+ g_strdup_printf ("%s/%" PRIu64, RPMOSTREE_HISTORY_DIR, entry->deploy_timestamp);
*out_deployment = NULL;
@@ -1165,7 +1165,7 @@ print_history_entry (RORHistoryEntry *entry,
print_timestamp_and_relative ("BootTimestamp", entry->last_boot_timestamp);
if (entry->boot_count > 1)
{
- g_print ("%s BootCount: %lu; first booted on ",
+ g_print ("%s BootCount: %" PRIu64 "; first booted on ",
libsd_special_glyph (TREE_RIGHT), entry->boot_count);
print_timestamp_and_relative (NULL, entry->first_boot_timestamp);
}
--
2.21.0

View File

@ -12,6 +12,8 @@ Source0: rpm-ostree-%{version}.tar.xz
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/projectatomic/rpm-ostree URL: https://github.com/projectatomic/rpm-ostree
Patch0: 0001-app-status-Fix-printf-format-string-for-32-bit.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
%if 0%{?fedora} %if 0%{?fedora}