From 2212faed6506023747148d144d15ace5eb9dc09c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 14 Oct 2022 09:40:04 +0300 Subject: [PATCH] Add an option for building with Sequoia crypto In preparation of https://fedoraproject.org/wiki/Changes/RpmSequoia but the default is still openssl for now. --- rpm.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/rpm.spec b/rpm.spec index b245e6e..f5cc179 100644 --- a/rpm.spec +++ b/rpm.spec @@ -25,12 +25,14 @@ %bcond_without sqlite # build with bdb_ro support? %bcond_without bdb_ro +# build with sequoia crypto? +%bcond_with sequoia %define rpmhome /usr/lib/rpm %global rpmver 4.18.0 #global snapver rc1 -%global baserelease 3 +%global baserelease 4 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -71,7 +73,6 @@ BuildRequires: gawk BuildRequires: elfutils-devel >= 0.112 BuildRequires: elfutils-libelf-devel BuildRequires: readline-devel zlib-devel -BuildRequires: openssl-devel # The popt version here just documents an older known-good version BuildRequires: popt-devel >= 1.10.2 BuildRequires: file-devel @@ -93,6 +94,15 @@ BuildRequires: libzstd-devel %if %{with sqlite} BuildRequires: sqlite-devel %endif + +%if %{with sequoia} +%global crypto sequoia +BuildRequires: rpm-sequoia-devel >= 1.0.0 +%else +%global crypto openssl +BuildRequires: openssl-devel +%endif + # Couple of patches change makefiles so, require for now... BuildRequires: automake libtool @@ -366,7 +376,7 @@ done; %{?with_sqlite: --enable-sqlite} \ %{?with_bdb_ro: --enable-bdb-ro} \ --enable-python \ - --with-crypto=openssl + --with-crypto=%{crypto} %make_build @@ -609,6 +619,9 @@ fi %doc docs/librpm/html/* %changelog +* Fri Oct 14 2022 Panu Matilainen - 4.18.0-4 +- Add an option for building with Sequoia crypto + * Wed Oct 05 2022 Panu Matilainen - 4.18.0-3 - Break ancient rpm <-> rpm-libs ordering loop