- enhanced engines-dir patch to adjust enginesdir in libcrypto.pc file; release 2

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 28e0c1eb2c462395c782abb2a1466428d8fb93cc..5ee3e583cae93961b3c51afe28ced789f70af315 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -13,12 +13,12 @@ Summary(pt_BR.UTF-8):       Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):     Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
-Version:       3.0.2
-Release:       1
+Version:       3.0.5
+Release:       2
 License:       Apache v2.0
 Group:         Libraries
 Source0:       https://www.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 7f9d43bb7a1e742722cf6d6f40531462
+# Source0-md5: 163bb3e58c143793d1dc6a6ec7d185d5
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
 Source4:       %{name}-c_rehash.sh
@@ -42,10 +42,10 @@ BuildRequires:      zlib-devel
 Requires:      ca-certificates >= 20141019-3
 Requires:      %{name}-tools = %{version}-%{release}
 Requires:      rpm-whiteout >= 1.7
-Obsoletes:     SSLeay
-Obsoletes:     SSLeay-devel
-Obsoletes:     SSLeay-perl
-Obsoletes:     libopenssl0
+Obsoletes:     SSLeay < 0.9.3
+Obsoletes:     SSLeay-devel < 0.9.3
+Obsoletes:     SSLeay-perl < 0.9.3
+Obsoletes:     libopenssl0 < 1
 Obsoletes:     openssl-engines < 3.0.0-2
 %if "%{pld_release}" == "ac"
 Conflicts:     neon < 0.26.3-3
@@ -146,7 +146,7 @@ Summary(ru.UTF-8):  Библиотеки, хедеры и утилиты для S
 Summary(uk.UTF-8):     Бібліотеки, хедери та утиліти для Secure Sockets Layer
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Obsoletes:     libopenssl0-devel
+Obsoletes:     libopenssl0-devel < 1
 
 %description devel
 Development part of OpenSSL library.
@@ -287,11 +287,18 @@ PERL="%{__perl}" \
 v=$(awk -F= '/^VERSION=/{print $2}' Makefile)
 test "$v" = %{version}
 
-%{__make} all %{?with_tests:tests} \
+%{__make} all \
        CC="%{__cc}" \
        OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
        INSTALLTOP=%{_prefix}
 
+%if %{with tests}
+%{__make} -j1 tests \
+       CC="%{__cc}" \
+       OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
+       INSTALLTOP=%{_prefix}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \