diff --git a/.gitignore b/.gitignore index f6f910f..f0fd903 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ /rpm-ostree-2022.12.tar.xz /rpm-ostree-2022.13.tar.xz /rpm-ostree-2022.14.tar.xz +/rpm-ostree-2022.16.tar.xz diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 7d6821a..b54cbd9 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,8 +3,8 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.14 -Release: 1%{?dist} +Version: 2022.16 +Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" @@ -49,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) @@ -103,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 @@ -113,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} @@ -245,7 +239,12 @@ $PYTHON autofiles.py > files.devel \ %files libs -f files.lib %files devel -f files.devel + %changelog +* Tue Nov 22 2022 Colin Walters - 2022.16-2 +- Rebase to 2022.16 + Resolves: rhbz#2144586 + * Thu Oct 13 2022 Joseph Marrero - 2022.14-1 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.14 diff --git a/sources b/sources index e6290a2..a0ad104 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2022.14.tar.xz) = 2c6e275106bb8ee9ead2b9e53fb951d27978c008b9807f963f276199d249d8582737ee5db294289b73fe00c1df5c124f40d09368c8d8d920817a0ae019901ef6 +SHA512 (rpm-ostree-2022.16.tar.xz) = eadfcb5e0f3ce97d5e4711e8a7db76d4470f528931cfd546657b11c47496154d25daad07bce6c33daeaa7f24e0e99972b41fc90a13133ac6f9facd8e53617325