/opt/libressl/lib is intentionally used for both 32 and 64 bit pkgs

Fixes: e6dfd91087
This commit is contained in:
Mikhail Novosyolov 2020-01-04 14:22:10 +03:00
parent e6dfd91087
commit 485e3a3439

View file

@ -13,7 +13,7 @@
%define _prefix /opt/libressl %define _prefix /opt/libressl
%define _bindir %{_prefix}/bin %define _bindir %{_prefix}/bin
%define _includedir %{_prefix}/include %define _includedir %{_prefix}/include
%define _libdir %{_prefix}/%{_lib} %define _libdir %{_prefix}/lib
%define _libexecdir %{_prefix}/libexec %define _libexecdir %{_prefix}/libexec
%define _datadir %{_prefix}/share %define _datadir %{_prefix}/share
%define _mandir %{_datadir}/man %define _mandir %{_datadir}/man
@ -61,7 +61,7 @@
Summary: LibreSSL utils and libs coexisting with OpenSSL Summary: LibreSSL utils and libs coexisting with OpenSSL
Name: libressl Name: libressl
Version: %{base_version}.git%{git_date} Version: %{base_version}.git%{git_date}
Release: 15 Release: 16
# The code is distributed under ISC license except of original OpenSSL code # The code is distributed under ISC license except of original OpenSSL code
License: ISC and BSD-like License: ISC and BSD-like
Group: System/Base Group: System/Base
@ -354,7 +354,7 @@ do
# It is lost due to --exec_prefix=XXX in %%configure2_5x # It is lost due to --exec_prefix=XXX in %%configure2_5x
sed -i -r \ sed -i -r \
-e 's,^exec_prefix=.+,exec_prefix=${prefix},' \ -e 's,^exec_prefix=.+,exec_prefix=${prefix},' \
-e 's,^libdir=.+,libdir=${exec_prefix}/%{_lib},' \ -e 's,^libdir=.+,libdir=${exec_prefix}/lib,' \
-e 's,^includedir=.+,includedir=${prefix}/include,' \ -e 's,^includedir=.+,includedir=${prefix}/include,' \
"$f" "$f"
mv -v "$f" "libressl-${f}" mv -v "$f" "libressl-${f}"