mirror of
https://abf.rosa.ru/djam/openssl.git
synced 2025-02-23 00:02:51 +00:00
use %%install_macro
This commit is contained in:
parent
6cf3aa0aff
commit
b8d9a3973f
1 changed files with 6 additions and 7 deletions
13
openssl.spec
13
openssl.spec
|
@ -19,7 +19,7 @@
|
|||
|
||||
%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.
|
||||
# The purpose is a system-wide definition of this directory
|
||||
# to guarantee consistency across the whole repository.
|
||||
|
@ -28,7 +28,7 @@
|
|||
Summary: Secure Sockets Layer communications libs & utils
|
||||
Name: openssl
|
||||
Version: %{openssl_ver}u
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: BSD-like
|
||||
Group: System/Libraries
|
||||
Url: https://www.openssl.org
|
||||
|
@ -172,7 +172,7 @@ and SSL.
|
|||
%{_libdir}/libssl.so
|
||||
%{_mandir}/man3/*
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_sys_macros_dir}/openssl.macros
|
||||
%{_rpmmacrodir}/*openssl*
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
@ -407,11 +407,10 @@ sed -i %{buildroot}/%{_bindir}/openssl-config \
|
|||
[ "$(%{buildroot}/%{_bindir}/openssl-config --openssldir)" = '%{_openssldir}' ]
|
||||
|
||||
# make and install openssl.macros
|
||||
install -d -m0755 %{buildroot}/%{_sys_macros_dir}
|
||||
cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > %{buildroot}/%{_sys_macros_dir}/openssl.macros
|
||||
chmod 0644 %{buildroot}/%{_sys_macros_dir}/openssl.macros
|
||||
cat %{SOURCE6} | sed -e "s#@OPENSSLDIR@#%{_openssldir}#g" > macros_file
|
||||
%install_macro openssl macros_file
|
||||
# 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
|
||||
rm -fv %{buildroot}%{_libdir}/openssl-%{major}/engines/libgost.so
|
||||
|
|
Loading…
Add table
Reference in a new issue