diff --git a/configure.ac b/configure.ac index c5370562c6..9c9d2bec7d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl dnl SEE RELEASE.md FOR INSTRUCTIONS ON HOW TO DO A RELEASE. dnl m4_define([year_version], [2022]) -m4_define([release_version], [15]) +m4_define([release_version], [16]) m4_define([package_version], [year_version.release_version]) AC_INIT([rpm-ostree], [package_version], [coreos@lists.fedoraproject.org]) AC_CONFIG_HEADER([config.h]) diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in index fdbcc300f7..16a110e72a 100644 --- a/packaging/rpm-ostree.spec.in +++ b/packaging/rpm-ostree.spec.in @@ -3,7 +3,7 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.15 +Version: 2022.16 Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree @@ -102,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 @@ -112,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} @@ -129,6 +124,12 @@ Requires: librepo%{?_isa} >= %{librepo_version} # end of libdnf build deps # ######################################################################### +%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 + # For now...see https://github.com/projectatomic/rpm-ostree/pull/637 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17 # etc. We'll drop this dependency at some point in the future when