Release 2019.4
This commit is contained in:
parent
cf661a4081
commit
91fffa27fe
1
.gitignore
vendored
1
.gitignore
vendored
@ -70,3 +70,4 @@
|
||||
/rpm-ostree-2019.2.tar.xz
|
||||
/rpm-ostree-2019.3.tar.xz
|
||||
/rpm-ostree-2019.3.5.g0da9f997.tar.xz
|
||||
/rpm-ostree-2019.4.tar.xz
|
||||
|
@ -1,35 +0,0 @@
|
||||
From 0c96b9281c518d242062a6f574bd1e6c7cb64111 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Lebon <jonathan@jlebon.com>
|
||||
Date: Mon, 6 May 2019 16:48:02 -0400
|
||||
Subject: [PATCH] core: Don't use `g_format_size`
|
||||
|
||||
Pungi right now is not completely UTF-8 aware, which makes it fail when
|
||||
trying to decode rpm-ostree output (the `g_format_size()` glib function
|
||||
uses a no-break space between the size value and its unit).
|
||||
|
||||
For now, just drop that call in the only path that pungi will hit so
|
||||
that our output is ASCII compliant. This is a quick hack until pungi
|
||||
correctly supports UTF-8.
|
||||
---
|
||||
src/libpriv/rpmostree-core.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libpriv/rpmostree-core.c b/src/libpriv/rpmostree-core.c
|
||||
index dc74e2d1..8390bc45 100644
|
||||
--- a/src/libpriv/rpmostree-core.c
|
||||
+++ b/src/libpriv/rpmostree-core.c
|
||||
@@ -2209,8 +2209,10 @@ rpmostree_context_download (RpmOstreeContext *self,
|
||||
{
|
||||
guint64 size =
|
||||
dnf_package_array_get_download_size (self->pkgs_to_download);
|
||||
+ /* https://pagure.io/releng/issue/8330#comment-569246
|
||||
g_autofree char *sizestr = g_format_size (size);
|
||||
- rpmostree_output_message ("Will download: %u package%s (%s)", n, _NS(n), sizestr);
|
||||
+ */
|
||||
+ rpmostree_output_message ("Will download: %u package%s (%" G_GUINT64_FORMAT " bytes)", n, _NS(n), size);
|
||||
}
|
||||
else
|
||||
return TRUE;
|
||||
--
|
||||
2.21.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: Hybrid image/package system
|
||||
Name: rpm-ostree
|
||||
Version: 2019.3.5.g0da9f997
|
||||
Release: 2%{?dist}
|
||||
Version: 2019.4
|
||||
Release: 1%{?dist}
|
||||
#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.
|
||||
@ -9,8 +9,6 @@ Source0: rpm-ostree-%{version}.tar.xz
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/projectatomic/rpm-ostree
|
||||
|
||||
Patch0: 0001-core-Don-t-use-g_format_size.patch
|
||||
|
||||
%if !%{defined rust_arches}
|
||||
# It's not defined yet in the base CentOS7 root
|
||||
%define rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
|
||||
@ -38,7 +36,7 @@ BuildRequires: gnome-common
|
||||
BuildRequires: /usr/bin/g-ir-scanner
|
||||
# Core requirements
|
||||
# One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members)
|
||||
BuildRequires: pkgconfig(ostree-1) >= 2018.9
|
||||
BuildRequires: pkgconfig(ostree-1) >= 2019.2
|
||||
BuildRequires: pkgconfig(polkit-gobject-1)
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
BuildRequires: pkgconfig(rpm)
|
||||
@ -183,6 +181,9 @@ $PYTHON autofiles.py > files.devel \
|
||||
%files devel -f files.devel
|
||||
|
||||
%changelog
|
||||
* Tue May 21 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4-1
|
||||
- New upstream version
|
||||
|
||||
* Mon May 06 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3.5.g0da9f997-2
|
||||
- Add temporary hack to avoid UTF-8 for Bodhi
|
||||
https://pagure.io/releng/issue/8330
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (rpm-ostree-2019.3.5.g0da9f997.tar.xz) = f58a73bf1d39e8f5d37e9aa3da03438e686d85cce05bea294972ed0e5c93b6ff4628e66fb84fc45b760f4ad6462437d81b25d91d5b817711bcf2ac50875a654b
|
||||
SHA512 (rpm-ostree-2019.4.tar.xz) = 80b3da553b097b127cf6140f41d303f7132a71a4894e1c3711d8b5a954f94714654e0e24c5d6f7f977b28f62bdb7874237c3072c21769a4988db39351027aacc
|
||||
|
Loading…
Reference in New Issue
Block a user