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.
This commit is contained in:
parent
27024cb2a8
commit
2212faed65
19
rpm.spec
19
rpm.spec
@ -25,12 +25,14 @@
|
|||||||
%bcond_without sqlite
|
%bcond_without sqlite
|
||||||
# build with bdb_ro support?
|
# build with bdb_ro support?
|
||||||
%bcond_without bdb_ro
|
%bcond_without bdb_ro
|
||||||
|
# build with sequoia crypto?
|
||||||
|
%bcond_with sequoia
|
||||||
|
|
||||||
%define rpmhome /usr/lib/rpm
|
%define rpmhome /usr/lib/rpm
|
||||||
|
|
||||||
%global rpmver 4.18.0
|
%global rpmver 4.18.0
|
||||||
#global snapver rc1
|
#global snapver rc1
|
||||||
%global baserelease 3
|
%global baserelease 4
|
||||||
%global sover 9
|
%global sover 9
|
||||||
|
|
||||||
%global srcver %{rpmver}%{?snapver:-%{snapver}}
|
%global srcver %{rpmver}%{?snapver:-%{snapver}}
|
||||||
@ -71,7 +73,6 @@ BuildRequires: gawk
|
|||||||
BuildRequires: elfutils-devel >= 0.112
|
BuildRequires: elfutils-devel >= 0.112
|
||||||
BuildRequires: elfutils-libelf-devel
|
BuildRequires: elfutils-libelf-devel
|
||||||
BuildRequires: readline-devel zlib-devel
|
BuildRequires: readline-devel zlib-devel
|
||||||
BuildRequires: openssl-devel
|
|
||||||
# The popt version here just documents an older known-good version
|
# The popt version here just documents an older known-good version
|
||||||
BuildRequires: popt-devel >= 1.10.2
|
BuildRequires: popt-devel >= 1.10.2
|
||||||
BuildRequires: file-devel
|
BuildRequires: file-devel
|
||||||
@ -93,6 +94,15 @@ BuildRequires: libzstd-devel
|
|||||||
%if %{with sqlite}
|
%if %{with sqlite}
|
||||||
BuildRequires: sqlite-devel
|
BuildRequires: sqlite-devel
|
||||||
%endif
|
%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...
|
# Couple of patches change makefiles so, require for now...
|
||||||
BuildRequires: automake libtool
|
BuildRequires: automake libtool
|
||||||
|
|
||||||
@ -366,7 +376,7 @@ done;
|
|||||||
%{?with_sqlite: --enable-sqlite} \
|
%{?with_sqlite: --enable-sqlite} \
|
||||||
%{?with_bdb_ro: --enable-bdb-ro} \
|
%{?with_bdb_ro: --enable-bdb-ro} \
|
||||||
--enable-python \
|
--enable-python \
|
||||||
--with-crypto=openssl
|
--with-crypto=%{crypto}
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
@ -609,6 +619,9 @@ fi
|
|||||||
%doc docs/librpm/html/*
|
%doc docs/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 14 2022 Panu Matilainen <pmatilai@redhat.com> - 4.18.0-4
|
||||||
|
- Add an option for building with Sequoia crypto
|
||||||
|
|
||||||
* Wed Oct 05 2022 Panu Matilainen <pmatilai@redhat.com> - 4.18.0-3
|
* Wed Oct 05 2022 Panu Matilainen <pmatilai@redhat.com> - 4.18.0-3
|
||||||
- Break ancient rpm <-> rpm-libs ordering loop
|
- Break ancient rpm <-> rpm-libs ordering loop
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user