import rpm-ostree-2022.19-3.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
2a92b92fe5
commit
ae61586e6e
|
|
@ -1 +1 @@
|
|||
SOURCES/rpm-ostree-2022.12.tar.xz
|
||||
SOURCES/rpm-ostree-2022.19.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3055cc0108e21979809cc2026e35493c57dfbec2 SOURCES/rpm-ostree-2022.12.tar.xz
|
||||
e07fc2eeed3979cf048a4db4e3b4d4218ee81791 SOURCES/rpm-ostree-2022.19.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
diff --color -urN rpm-ostree-2022.10.90.g4abaf4b4-orig/src/app/rpmostree-builtin-status.cxx rpm-ostree-2022.10.90.g4abaf4b4/src/app/rpmostree-builtin-status.cxx
|
||||
--- rpm-ostree-2022.10.90.g4abaf4b4-orig/src/app/rpmostree-builtin-status.cxx 2022-08-16 08:40:32.000000000 -0400
|
||||
+++ rpm-ostree-2022.10.90.g4abaf4b4/src/app/rpmostree-builtin-status.cxx 2023-02-07 19:56:17.018048420 -0500
|
||||
@@ -489,10 +489,7 @@
|
||||
g_autoptr (GVariant) reposdata = g_variant_dict_lookup_value (
|
||||
commit_meta, "rpmostree.rpmmd-repos", G_VARIANT_TYPE ("aa{sv}"));
|
||||
|
||||
- if (!reposdata)
|
||||
- return;
|
||||
-
|
||||
- const guint n = g_variant_n_children (reposdata);
|
||||
+ const guint n = reposdata ? g_variant_n_children (reposdata) : 0;
|
||||
if (n == 0 || !opt_verbose)
|
||||
{
|
||||
/* no repos to print, so this is just a pure kv print */
|
||||
diff --color -urN rpm-ostree-2022.10.90.g4abaf4b4-orig/tests/vmcheck/test-misc-2.sh rpm-ostree-2022.10.90.g4abaf4b4/tests/vmcheck/test-misc-2.sh
|
||||
--- rpm-ostree-2022.10.90.g4abaf4b4-orig/tests/vmcheck/test-misc-2.sh 2022-08-16 08:40:32.000000000 -0400
|
||||
+++ rpm-ostree-2022.10.90.g4abaf4b4/tests/vmcheck/test-misc-2.sh 2023-02-07 19:57:05.111019172 -0500
|
||||
@@ -26,6 +26,10 @@
|
||||
|
||||
# More miscellaneous tests
|
||||
|
||||
+# Verify that the commit is printed in the output
|
||||
+vm_rpmostree status > status.txt
|
||||
+assert_file_has_content status.txt 'Commit:'
|
||||
+
|
||||
# Locked finalization
|
||||
booted_csum=$(vm_get_booted_csum)
|
||||
commit=$(vm_cmd ostree commit -b vmcheck --tree=ref=vmcheck)
|
||||
|
|
@ -3,14 +3,13 @@
|
|||
|
||||
Summary: Hybrid image/package system
|
||||
Name: rpm-ostree
|
||||
Version: 2022.12
|
||||
Version: 2022.19
|
||||
Release: 3%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/coreos/rpm-ostree
|
||||
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
|
||||
# in the upstream git. It also contains vendored Rust sources.
|
||||
Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
|
||||
Patch0: 0000-fix-printing-commits-on-status.patch
|
||||
|
||||
ExclusiveArch: %{rust_arches}
|
||||
|
||||
|
|
@ -50,7 +49,6 @@ BuildRequires: autoconf automake libtool git
|
|||
# For docs
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: gtk-doc
|
||||
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)
|
||||
|
|
@ -104,6 +102,9 @@ BuildRequires: pkgconfig(check)
|
|||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0
|
||||
BuildRequires: pkgconfig(gtk-doc)
|
||||
BuildRequires: rpm-devel >= 4.15.0
|
||||
%if %{with rhsm}
|
||||
BuildRequires: pkgconfig(librhsm) >= 0.0.3
|
||||
%endif
|
||||
%if %{with zchunk}
|
||||
BuildRequires: pkgconfig(zck) >= 0.9.11
|
||||
%endif
|
||||
|
|
@ -114,14 +115,6 @@ BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
|
|||
BuildRequires: pkgconfig(smartcols)
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gpgme-devel
|
||||
%if 0%{?rhel} <= 8
|
||||
# In current Fedora, this is a dependency of gpgme-devel, but
|
||||
# not in RHEL8. Missing this package breaks -znow.
|
||||
BuildRequires: libassuan-devel
|
||||
%endif
|
||||
%if %{with rhsm}
|
||||
BuildRequires: pkgconfig(librhsm) >= 0.0.3
|
||||
%endif
|
||||
|
||||
Requires: libmodulemd%{?_isa} >= %{libmodulemd_version}
|
||||
Requires: libsolv%{?_isa} >= %{libsolv_version}
|
||||
|
|
@ -246,9 +239,27 @@ $PYTHON autofiles.py > files.devel \
|
|||
%files libs -f files.lib
|
||||
|
||||
%files devel -f files.devel
|
||||
|
||||
%changelog
|
||||
* Wed Feb 15 2023 Joseph Marrero <jmarrero@redhat.com> - 2022.12-3
|
||||
- Resolves: rhbz#2167477
|
||||
* Tue Dec 20 2022 Colin Walters <walters@verbum.org> - 2022.19-3
|
||||
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.19
|
||||
Resolves: rhbz#2153460
|
||||
|
||||
* Wed Dec 14 2022 Colin Walters <walters@verbum.org> - 2022.18-2
|
||||
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.18
|
||||
Resolves: rhbz#2153460
|
||||
|
||||
* Tue Nov 22 2022 Colin Walters <walters@verbum.org> - 2022.16-2
|
||||
- Rebase to 2022.16
|
||||
Resolves: rhbz#2144586
|
||||
|
||||
* Thu Oct 13 2022 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.14-1
|
||||
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.14
|
||||
|
||||
* Tue Sep 13 2022 Luca BRUNO <lucab@redhat.com> - 2022.13-1
|
||||
- New upstream version
|
||||
https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
|
||||
Resolves: rhbz#2126108
|
||||
|
||||
* Tue Jul 19 2022 Colin Walters <walters@verbum.org> - 2022.12-2
|
||||
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
|
||||
|
|
|
|||
Loading…
Reference in New Issue