rpms/ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity

https://github.com/ostreedev/ostree/releases/tag/v2018.6

Browse Source
This commit is contained in:
Colin Walters 2018-06-21 14:10:34 +00:00
parent 9f3e894bb9
commit 4ef1b4e46f
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-lib-repo-Fix-32-bit-format-string-error.patch Normal file
View File

@ -0,0 +1,34 @@
From c49fed3335e6c5213c851ff7b2f00d92462bc210 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 21 Jun 2018 14:17:28 +0000
Subject: [PATCH] lib/repo: Fix 32 bit format string error
---
src/libostree/ostree-repo-commit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 37be748b..7e1d707b 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self,
return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required",
self->min_free_space_percent, formatted_required);
else
- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required",
+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required",
self->min_free_space_mb, formatted_required);
}
/* This is the main bit that needs mutex protection */
@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available",
self->min_free_space_percent, formatted_free);
else
- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available",
+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available",
self->min_free_space_mb, formatted_free);
}
g_mutex_unlock (&self->txn_lock);
--
2.17.1

5
ostree.spec
View File

@ -1,8 +1,9 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
Version: 2018.6
Release: 2%{?dist}
Release: 3%{?dist}
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
Patch32: 0001-lib-repo-Fix-32-bit-format-string-error.patch
License: LGPLv2+
URL: https://ostree.readthedocs.io/en/latest/
@ -153,7 +154,7 @@ find %{buildroot} -name '*.la' -delete
%{_libexecdir}/libostree/ostree-trivial-httpd
%changelog
* Thu Jun 21 2018 Colin Walters <walters@redhat.com> - 2018.6-2
* Thu Jun 21 2018 Colin Walters <walters@redhat.com> - 2018.6-3
- https://github.com/ostreedev/ostree/releases/tag/v2018.6
* Fri May 11 2018 Colin Walters <walters@verbum.org> - 2018.5-1