import ostree-2021.3-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/libostree-2020.7.tar.xz
+SOURCES/libostree-2021.3.tar.xz

.ostree.metadata

@@ -1 +1 @@
-c9f8ca77723040a4c87b9119305ad54e1694772c SOURCES/libostree-2020.7.tar.xz
+b8a32cd735b2abccb72464ea33806e4944b0440e SOURCES/libostree-2021.3.tar.xz

SOURCES/0001-gcc11.patch

@@ -1,40 +0,0 @@
-From 267e8eb3849a539704c480512b135400c7e49309 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Fri, 30 Oct 2020 11:40:03 -0600
-Subject: [PATCH] gcc11
-
-gcc-11
----
- src/libostree/ostree-enumtypes.c.template | 2 +-
- src/libostree/ostree-sysroot-upgrader.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-enumtypes.c.template b/src/libostree/ostree-enumtypes.c.template
-index 751c458..89ad32a 100644
---- a/src/libostree/ostree-enumtypes.c.template
-+++ b/src/libostree/ostree-enumtypes.c.template
-@@ -36,7 +36,7 @@
- GType
- _@enum_name@_get_type (void)
- {
--  static volatile gsize the_type__volatile = 0;
-+  static gsize the_type__volatile = 0;
- 
-   if (g_once_init_enter (&the_type__volatile))
-     {
-diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c
-index 4681335..ea68674 100644
---- a/src/libostree/ostree-sysroot-upgrader.c
-+++ b/src/libostree/ostree-sysroot-upgrader.c
-@@ -682,7 +682,7 @@ ostree_sysroot_upgrader_deploy (OstreeSysrootUpgrader  *self,
- GType
- ostree_sysroot_upgrader_flags_get_type (void)
- {
--  static volatile gsize g_define_type_id__volatile = 0;
-+  static gsize g_define_type_id__volatile = 0;
- 
-   if (g_once_init_enter (&g_define_type_id__volatile))
-     {
--- 
-2.28.0
-

SOURCES/0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch

@@ -1,30 +0,0 @@
-From dec9eab2030a212b3713379af9d74c625ecce137 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Thu, 15 Oct 2020 12:05:34 -0400
-Subject: [PATCH] ostree-prepare-root: print st_dev and st_ino as 64-bit ints
-
-This matches what systemd does and should work fine on all platforms.
-
-Possibly resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1888436
----
- src/switchroot/ostree-prepare-root.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
-index 6351babb..6bc2c374 100644
---- a/src/switchroot/ostree-prepare-root.c
-+++ b/src/switchroot/ostree-prepare-root.c
-@@ -152,8 +152,8 @@ resolve_deploy_path (const char * root_mountpoint)
-                    "MESSAGE_ID=" SD_ID128_FORMAT_STR,
-                    SD_ID128_FORMAT_VAL(OSTREE_PREPARE_ROOT_DEPLOYMENT_MSG),
-                    "DEPLOYMENT_PATH=%s", resolved_path,
--                   "DEPLOYMENT_DEVICE=%u", stbuf.st_dev,
--                   "DEPLOYMENT_INODE=%u", stbuf.st_ino,
-+                   "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev,
-+                   "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino,
-                    NULL);
- #endif
-   return deploy_path;
--- 
-2.26.2
-

SPECS/ostree.spec

@@ -7,15 +7,13 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2020.7
+Version: 2021.3
 Release: 1%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
-Patch0: 0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch
+BuildRequires: make
-Patch1: 0001-gcc11.patch
-
 BuildRequires: git
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool
@@ -165,6 +163,15 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Tue Jul 20 2021 Luca BRUNO <lucab@redhat.com> - 2021.3-1
+- New upstream version
+  https://github.com/ostreedev/ostree/releases/tag/v2021.3
+  Resolves: rhbz#1981865
+
+* Fri May 14 2021 Luca BRUNO <lucab@redhat.com> - 2021.2-1
+- New upstream version 2021.2
+  https://github.com/ostreedev/ostree/releases/tag/v2021.2
+
 * Tue Nov  3 15:04:48 UTC 2020 Colin Walters <walters@verbum.org> - 2020.7-1
 - Update to 2020.7
   Resolves: #1894062