From 23579b4b3d0c7d804899784cd70dffc239d9655c Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Mon, 2 Mar 2020 01:03:05 +0000 Subject: [PATCH 1/2] drop multiarch --- openssl.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/openssl.spec b/openssl.spec index 29703ee..3b569e4 100644 --- a/openssl.spec +++ b/openssl.spec @@ -165,7 +165,6 @@ and SSL. %files -n %{devname} %doc CHANGES doc/* devel-doc-info/README* %dir %{_includedir}/openssl -%{multiarch_includedir}/openssl/opensslconf.h %{_includedir}/openssl/* %{_libdir}/libcrypto.so %{_libdir}/libssl.so @@ -360,8 +359,6 @@ EOF chmod 755 %{buildroot}%{_libdir}/pkgconfig -%multiarch_includes %{buildroot}%{_includedir}/openssl/opensslconf.h - # strip cannot touch these unless 755 chmod 755 %{buildroot}%{_libdir}/openssl-%{major}/engines/*.so* chmod 755 %{buildroot}%{_libdir}/*.so* From b1e6ee8c1edea49fe2fb7642acf19a9be9543fe1 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 14 Mar 2020 13:12:24 +0300 Subject: [PATCH 2/2] allow to remove gost-engine if needed on new rpm4+dnf platforms --- openssl.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openssl.spec b/openssl.spec index 3b569e4..9ec3808 100644 --- a/openssl.spec +++ b/openssl.spec @@ -27,7 +27,7 @@ Summary: Secure Sockets Layer communications libs & utils Name: openssl Version: 1.0.2u -Release: 3 +Release: 4 License: BSD-like Group: System/Libraries Url: https://www.openssl.org @@ -100,7 +100,14 @@ Summary: Engines for openssl Group: System/Libraries Provides: openssl-engines = %{EVRD} # libgost.so was moved to openssl-gost-engine +%if %rpm5 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} This package provides engines for openssl.