From 3453bdccd1950e40cf8b625b19cf30c6a8697053677e9e8e55dfb6bb04ca0ecb Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 1 Feb 2022 15:09:19 +0000 Subject: [PATCH] Accepting request 950451 from home:dspinella:branches:security:tls - Fix conflict with openssl and libressl OBS-URL: https://build.opensuse.org/request/show/950451 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=34 --- openssl-3.changes | 5 +++++ openssl-3.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openssl-3.changes b/openssl-3.changes index 586c7f4..b20cdfb 100644 --- a/openssl-3.changes +++ b/openssl-3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 1 13:55:24 UTC 2022 - Danilo Spinella + +- Fix conflict with openssl and libressl + ------------------------------------------------------------------- Fri Jan 28 08:32:43 UTC 2022 - Simon Lees diff --git a/openssl-3.spec b/openssl-3.spec index ff83697..e95580c 100644 --- a/openssl-3.spec +++ b/openssl-3.spec @@ -74,6 +74,7 @@ Recommends: %{name} = %{version} # We need to have around only the exact version we are able to operate with Conflicts: libopenssl-devel < %{version} Conflicts: libopenssl-devel > %{version} +Conflicts: libressl-devel Conflicts: ssl-devel %description -n libopenssl-3-devel @@ -227,8 +228,8 @@ cp %{SOURCE5} . %dir %{ssletcdir} %config (noreplace) %{ssletcdir}/openssl3.cnf %attr(700,root,root) %{ssletcdir}/private -%{ssletcdir}/ct_log_list.cnf -%{ssletcdir}/ct_log_list.cnf.dist +%config (noreplace) %{ssletcdir}/ct_log_list.cnf +%config (noreplace) %{ssletcdir}/ct_log_list.cnf.dist %dir %{_datadir}/ssl-3 %{_datadir}/ssl-3/misc