From 92a2e5b64df02dec2d8067ed13e8fd368dc77e48 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 11 2022 16:49:41 +0000 Subject: import rpm-ostree-2021.14-3.el9 --- diff --git a/.gitignore b/.gitignore index 4dc28f3..32c290c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rpm-ostree-2021.6.tar.xz +SOURCES/rpm-ostree-2021.14.tar.xz diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata index 915a064..d0ace46 100644 --- a/.rpm-ostree.metadata +++ b/.rpm-ostree.metadata @@ -1 +1 @@ -99cda8aed34d71a48a70143cec7405c5608d5a0f SOURCES/rpm-ostree-2021.6.tar.xz +600773ce823ad028fc3668c9c9c015e98c80d5dc SOURCES/rpm-ostree-2021.14.tar.xz diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index 159bdb3..c979f3a 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -3,8 +3,8 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2021.6 -Release: 2%{?dist} +Version: 2021.14 +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" @@ -25,10 +25,9 @@ BuildRequires: rust # Enable ASAN + UBSAN %bcond_with sanitizers -# 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. -%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 @@ -49,7 +48,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) >= 2020.7 +BuildRequires: pkgconfig(ostree-1) >= 2021.5 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(rpm) >= 4.16.0 @@ -213,6 +212,14 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Wed Dec 01 2021 Colin Walters - 2021.14-3 +- Drop zchunk dependency + Resolves: rhbz#2028167 + +* Mon Nov 29 2021 Colin Walters - 2021.14-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2021.14 + Resolves: rhbz#2027476 + * Tue Aug 10 2021 Mohan Boddu - 2021.6-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688