Skip to content

Commit 9d1f9f0

Browse files
committed
ci: fix RPM spec to build packages for Fedora 36
In Fedora 36 the default version of the `openssl-devel` package is 3. But for now Tarantool doesn't work with this version. So this patch adds a workaround with installation of the `openssl1.1-devel` package to build rpms and exporting env variable `OPENSSL_CONF=/dev/null` to pass tests. See for details: tarantool#6477. NO_DOC=ci NO_TEST=ci NO_CHANGELOG=ci
1 parent 0751619 commit 9d1f9f0

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

rpm/tarantool.spec

+20
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,14 @@ BuildRequires: gcc-c++ >= 4.5
3535
BuildRequires: coreutils
3636
BuildRequires: sed
3737
BuildRequires: readline-devel
38+
%if 0%{?fedora} >= 36
39+
# In Fedora 36 the default version of the openssl-devel package is 3.
40+
# But for now Tarantool doesn't work with this version. See for details:
41+
# https://github.com/tarantool/tarantool/issues/6477
42+
BuildRequires: openssl1.1-devel
43+
%else
3844
BuildRequires: openssl-devel
45+
%endif
3946
BuildRequires: libicu-devel
4047
#BuildRequires: msgpuck-devel
4148
%if 0%{?fedora} > 0
@@ -127,7 +134,14 @@ Requires: /etc/protocols
127134
Requires: /etc/services
128135
# Deps for built-in package manager
129136
# https://github.com/tarantool/tarantool/issues/2612
137+
%if 0%{?fedora} >= 36
138+
# In Fedora 36 the default version of the openssl-devel package is 3.
139+
# But for now Tarantool doesn't work with this version. See for details:
140+
# https://github.com/tarantool/tarantool/issues/6477
141+
Requires: openssl1.1
142+
%else
130143
Requires: openssl
144+
%endif
131145
%if (0%{?fedora} >= 22 || 0%{?rhel} >= 8 || 0%{?sle_version} >= 1500)
132146
# RHEL <= 7 doesn't support Recommends:
133147
Recommends: tarantool-devel
@@ -208,7 +222,13 @@ make %{?_smp_mflags}
208222
rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/
209223

210224
%check
225+
%if 0%{?fedora} >= 36
226+
# Workaround to make app/crypto.test.lua and app/digest.test.lua tests work.
227+
# See for details: https://github.com/tarantool/tarantool/issues/6477
228+
OPENSSL_CONF=/dev/null make test-force
229+
%else
211230
make test-force
231+
%endif
212232

213233
%pre
214234
/usr/sbin/groupadd -r tarantool > /dev/null 2>&1 || :

0 commit comments

Comments
 (0)