diff --git a/rpm-ostree.spec b/rpm-ostree.spec index cc49907..8abb422 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,8 +3,8 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.1 -Release: 3%{?dist} +Version: 2022.2 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" @@ -24,12 +24,12 @@ BuildRequires: rust # Enable ASAN + UBSAN %bcond_with sanitizers +# Embedded unit tests +%bcond_with bin_unit_tests -# RHEL8 doesn't ship zchunk today. See also the comments -# in configure.ac around this as libdnf/librepo need to be in -# sync, and today we bundle libdnf but not librepo. Also -# flip the rpmdb default to be bdb. -%if 0%{?rhel} && 0%{?rhel} <= 8 +# RHEL (8,9) doesn't ship zchunk today. Keep this in sync +# with libdnf: https://gitlab.com/redhat/centos-stream/rpms/libdnf/-/blob/762f631e36d1e42c63a794882269d26c156b68c1/libdnf.spec#L45 +%if 0%{?rhel} %bcond_with zchunk %else %bcond_without zchunk @@ -46,7 +46,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) >= 2021.1 +BuildRequires: pkgconfig(ostree-1) >= 2021.5 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(rpm) >= 4.14.0 @@ -70,6 +70,11 @@ BuildRequires: pkgconfig(check) # but duplicating to be clear) BuildRequires: pkgconfig(libsolv) +# These are build deps which aren't strictly required in Koji/Brew builds, but +# are required for git builds. Since they're few and tiny, we just add it here +# to keep it part of `dnf builddep`. +BuildRequires: jq + ######################################################################### # libdnf build deps # # # @@ -119,6 +124,10 @@ Requires: ostree Requires: bubblewrap Requires: fuse +# For container functionality +# https://github.com/coreos/rpm-ostree/issues/3286 +Recommends: skopeo + Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -156,7 +165,7 @@ env NOCONFIGURE=1 ./autogen.sh %if 0%{?build_rustflags:1} export RUSTFLAGS="%{build_rustflags}" %endif -%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers} +%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers} %{?with_bin_unit_tests:--enable-bin-unit-tests} %make_build @@ -221,6 +230,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Thu Feb 03 2022 Joseph Marrero - 2022.2-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.2 + * Fri Jan 21 2022 Fedora Release Engineering - 2022.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild