Djam/openssl
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/openssl.git synced 2025-02-23 08:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rosa2019.1' into rosa2016.1

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-01-21 15:10:26 +03:00
commit 8778366b79
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openssl.spec
View file

@ -1,4 +1,3 @@
%define openssl_ver 1.0.2
%define major 1.0.0 %define major 1.0.0
%define engines_name %mklibname openssl-engines %{major} %define engines_name %mklibname openssl-engines %{major}
%define libcrypto %mklibname crypto %{major} %define libcrypto %mklibname crypto %{major}
@ -19,7 +18,7 @@
%define with_krb5 %{?_with_krb5:1}%{!?_with_krb5:0} %define with_krb5 %{?_with_krb5:1}%{!?_with_krb5:0}
# This directory is defined in /usr/bin/openssl-config and /etc/rpm/macros.d/openssl.macros # This directory is defined in /usr/bin/openssl-config and %%_rpmmacrodir/*openssl*
# during the build. # during the build.
# The purpose is a system-wide definition of this directory # The purpose is a system-wide definition of this directory
# to guarantee consistency across the whole repository. # to guarantee consistency across the whole repository.
@ -27,8 +26,8 @@
Summary: Secure Sockets Layer communications libs & utils Summary: Secure Sockets Layer communications libs & utils
Name: openssl Name: openssl
Version: %{openssl_ver}u Version: 1.0.2u
Release: 1 Release: 3
License: BSD-like License: BSD-like
Group: System/Libraries Group: System/Libraries
Url: https://www.openssl.org Url: https://www.openssl.org
@ -172,7 +171,7 @@ and SSL.
%{_libdir}/libssl.so %{_libdir}/libssl.so
%{_mandir}/man3/* %{_mandir}/man3/*
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%{_sys_macros_dir}/openssl.macros %{_rpmmacrodir}/*openssl*
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -407,11 +406,10 @@ sed -i %{buildroot}/%{_bindir}/openssl-config \
[ "$(%{buildroot}/%{_bindir}/openssl-config --openssldir)" = '%{_openssldir}' ] [ "$(%{buildroot}/%{_bindir}/openssl-config --openssldir)" = '%{_openssldir}' ]
# make and install openssl.macros # make and install openssl.macros
install -d -m0755 %{buildroot}/%{_sys_macros_dir} cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > macros_file
cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > %{buildroot}/%{_sys_macros_dir}/openssl.macros %install_macro openssl macros_file
chmod 0644 %{buildroot}/%{_sys_macros_dir}/openssl.macros
# verify openssl.macros # verify openssl.macros
grep -q '%{_openssldir}' %{buildroot}%{_sys_macros_dir}/openssl.macros grep -q '%{_openssldir}' %{buildroot}%{_rpmmacrodir}/*openssl*
# is now built in openssl-gost-engines # is now built in openssl-gost-engines
rm -fv %{buildroot}%{_libdir}/openssl-%{major}/engines/libgost.so rm -fv %{buildroot}%{_libdir}/openssl-%{major}/engines/libgost.so