From effdf84ffa2d7f269d32f31256eaceaad5f6e7c49e9609544b3a37876c4e6e9b Mon Sep 17 00:00:00 2001 From: Otto Hollmann Date: Wed, 21 Jun 2023 13:11:59 +0000 Subject: [PATCH] Accepting request 1094355 from security:tls:unstable - Improve cross-package provides/conflicts [boo#1210313] * Add Provides/Conflicts: ssl-devel * Remove explicit conflicts with other devel-libraries OBS-URL: https://build.opensuse.org/request/show/1094355 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=136 --- openssl-1_1.changes | 7 +++++++ openssl-1_1.spec | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/openssl-1_1.changes b/openssl-1_1.changes index b2ed472..2060bd8 100644 --- a/openssl-1_1.changes +++ b/openssl-1_1.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 20 15:18:56 UTC 2023 - Otto Hollmann + +- Improve cross-package provides/conflicts [boo#1210313] + * Add Provides/Conflicts: ssl-devel + * Remove explicit conflicts with other devel-libraries + ------------------------------------------------------------------- Wed May 31 08:31:09 UTC 2023 - Otto Hollmann diff --git a/openssl-1_1.spec b/openssl-1_1.spec index caf42c7..270d07f 100644 --- a/openssl-1_1.spec +++ b/openssl-1_1.spec @@ -134,6 +134,7 @@ Patch79: openssl-1_1-Fix-AES-GCM-on-Power-8-CPUs.patch Patch80: openssl-1_1-openssl-config.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(zlib) +Provides: ssl Requires: libopenssl1_1 = %{version}-%{release} %if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550 Requires: crypto-policies @@ -180,8 +181,7 @@ Requires: libopenssl1_1 = %{version} Requires: pkgconfig(zlib) Recommends: %{name} = %{version} Conflicts: ssl-devel -# Conflicting names with libopenssl-3-devel -Conflicts: libopenssl-3-devel +Provides: ssl-devel # Needed for clean upgrade from former openssl-1_1_0, boo#1081335 Obsoletes: libopenssl-1_1_0-devel # Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499