Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2022.16 #4154

Merged
merged 1 commit into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
19 changes: 10 additions & 9 deletions packaging/rpm-ostree.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
jlebon marked this conversation as resolved.
Show resolved Hide resolved
BuildRequires: pkgconfig(librhsm) >= 0.0.3
%endif
%if %{with zchunk}
BuildRequires: pkgconfig(zck) >= 0.9.11
%endif
Expand All @@ -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}
Expand All @@ -129,6 +124,12 @@ Requires: librepo%{?_isa} >= %{librepo_version}
# end of libdnf build deps #
#########################################################################

%if 0%{?rhel} <= 8
jlebon marked this conversation as resolved.
Show resolved Hide resolved
# 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
Expand Down