Merged update from upstream sources

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/rpm-ostree.git#d1f19b1dd74218181c80d4eaac2c2f998a0c81c7

gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch

@@ -0,0 +1,29 @@
+From ac26db038e67ea7fe8236cfafabcba74ad89b894 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 22 Oct 2020 14:25:51 +0000
+Subject: [PATCH] sysroot: Fix usage of sd_journal_send on 32 bit
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=1890577
+
+This is the same as https://github.com/ostreedev/ostree/pull/2219
+---
+ src/daemon/rpmostree-sysroot-upgrader.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c
+index 32e77a0a3..7a8e1e9ea 100644
+--- a/src/daemon/rpmostree-sysroot-upgrader.c
++++ b/src/daemon/rpmostree-sysroot-upgrader.c
+@@ -1328,9 +1328,9 @@ write_history (RpmOstreeSysrootUpgrader *self,
+                    SD_ID128_FORMAT_VAL(RPMOSTREE_NEW_DEPLOYMENT_MSG),
+                    "MESSAGE=Created new deployment /%s", deployment_dirpath,
+                    "DEPLOYMENT_PATH=/%s", deployment_dirpath,
+-                   "DEPLOYMENT_TIMESTAMP=%ld", stbuf.st_ctime,
+-                   "DEPLOYMENT_DEVICE=%u", stbuf.st_dev,
+-                   "DEPLOYMENT_INODE=%u", stbuf.st_ino,
++                   "DEPLOYMENT_TIMESTAMP=%" PRIu64, (uint64_t) stbuf.st_ctime,
++                   "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev,
++                   "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino,
+                    "DEPLOYMENT_CHECKSUM=%s", ostree_deployment_get_csum (new_deployment),
+                    "DEPLOYMENT_REFSPEC=%s", rpmostree_origin_get_refspec (self->origin),
+                    /* we could use iovecs here and sd_journal_sendv to make these truly

rpm-ostree.spec

@@ -4,13 +4,14 @@
 Summary: Hybrid image/package system
 Name: rpm-ostree
 Version: 2020.5
-Release: 1%{?dist}
+Release: 2%{?dist}
+License: LGPLv2+
+URL: https://github.com/projectatomic/rpm-ostree
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  If rust is enabled, it contains vendored sources.
 Source0: rpm-ostree-%{version}.tar.xz
-License: LGPLv2+
+Patch0:  gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch
-URL: https://github.com/projectatomic/rpm-ostree
 
 ExclusiveArch: %{rust_arches}
 
@@ -194,6 +195,9 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.5-2
+- sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)
+
 * Tue Sep 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.5-1
 - New upstream version
   https://github.com/coreos/rpm-ostree/releases/tag/v2020.5
@@ -216,7 +220,7 @@ $PYTHON autofiles.py > files.devel \
 * Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2020.3-2
 - Disable LTO
 
-* Wed Feb 05 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-1
+* Fri Jun 19 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-1
 - New upstream version
   https://github.com/coreos/rpm-ostree/releases/tag/v2020.3