mirror of
https://abf.rosa.ru/djam/openssl.git
synced 2025-02-23 08:12:50 +00:00
Merge branch 'master' into rosa2016.1
This commit is contained in:
commit
5b5065da39
1 changed files with 8 additions and 4 deletions
12
openssl.spec
12
openssl.spec
|
@ -27,7 +27,7 @@
|
||||||
Summary: Secure Sockets Layer communications libs & utils
|
Summary: Secure Sockets Layer communications libs & utils
|
||||||
Name: openssl
|
Name: openssl
|
||||||
Version: 1.0.2u
|
Version: 1.0.2u
|
||||||
Release: 3
|
Release: 4
|
||||||
License: BSD-like
|
License: BSD-like
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Url: https://www.openssl.org
|
Url: https://www.openssl.org
|
||||||
|
@ -100,7 +100,14 @@ Summary: Engines for openssl
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Provides: openssl-engines = %{EVRD}
|
Provides: openssl-engines = %{EVRD}
|
||||||
# libgost.so was moved to openssl-gost-engine
|
# libgost.so was moved to openssl-gost-engine
|
||||||
|
%if %rpm5
|
||||||
Requires: %{_lib}openssl-gost-engine%{major}
|
Requires: %{_lib}openssl-gost-engine%{major}
|
||||||
|
%else
|
||||||
|
# We must keep openssl-gost-engine preinstalled in rpm5 platforms.
|
||||||
|
# But dnf installs recommended deps in more cases then urpmi,
|
||||||
|
# So let's let users remove gost-engine if needed.
|
||||||
|
Recommends: %{_lib}openssl-gost-engine%{major}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n %{engines_name}
|
%description -n %{engines_name}
|
||||||
This package provides engines for openssl.
|
This package provides engines for openssl.
|
||||||
|
@ -165,7 +172,6 @@ and SSL.
|
||||||
%files -n %{devname}
|
%files -n %{devname}
|
||||||
%doc CHANGES doc/* devel-doc-info/README*
|
%doc CHANGES doc/* devel-doc-info/README*
|
||||||
%dir %{_includedir}/openssl
|
%dir %{_includedir}/openssl
|
||||||
%{multiarch_includedir}/openssl/opensslconf.h
|
|
||||||
%{_includedir}/openssl/*
|
%{_includedir}/openssl/*
|
||||||
%{_libdir}/libcrypto.so
|
%{_libdir}/libcrypto.so
|
||||||
%{_libdir}/libssl.so
|
%{_libdir}/libssl.so
|
||||||
|
@ -360,8 +366,6 @@ EOF
|
||||||
|
|
||||||
chmod 755 %{buildroot}%{_libdir}/pkgconfig
|
chmod 755 %{buildroot}%{_libdir}/pkgconfig
|
||||||
|
|
||||||
%multiarch_includes %{buildroot}%{_includedir}/openssl/opensslconf.h
|
|
||||||
|
|
||||||
# strip cannot touch these unless 755
|
# strip cannot touch these unless 755
|
||||||
chmod 755 %{buildroot}%{_libdir}/openssl-%{major}/engines/*.so*
|
chmod 755 %{buildroot}%{_libdir}/openssl-%{major}/engines/*.so*
|
||||||
chmod 755 %{buildroot}%{_libdir}/*.so*
|
chmod 755 %{buildroot}%{_libdir}/*.so*
|
||||||
|
|
Loading…
Add table
Reference in a new issue