From b496b916bdbec6e8250c5cbad1aac9488e6ba3936e8bf65258bca34e92e9de5a Mon Sep 17 00:00:00 2001 From: Otto Hollmann Date: Wed, 21 Jun 2023 13:05:11 +0000 Subject: [PATCH] - Improve cross-package provides/conflicts [boo#1210313] * Add Provides/Conflicts: ssl-devel * Remove explicit conflicts with other devel-libraries * Remove Provides: openssl(cli) - it's managed by meta package OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=65 --- openssl-3.changes | 8 ++++++++ openssl-3.spec | 7 ++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openssl-3.changes b/openssl-3.changes index 6ffbd32..6d5741f 100644 --- a/openssl-3.changes +++ b/openssl-3.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + * Remove Provides: openssl(cli) - it's managed by meta package + ------------------------------------------------------------------- Tue May 30 15:14:51 UTC 2023 - Otto Hollmann diff --git a/openssl-3.spec b/openssl-3.spec index 73226b1..a909b17 100644 --- a/openssl-3.spec +++ b/openssl-3.spec @@ -55,9 +55,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(zlib) Requires: libopenssl3 = %{version}-%{release} Requires: openssl -Conflicts: ssl Provides: ssl -Provides: openssl(cli) # Needed for clean upgrade path, boo#1070003 Obsoletes: openssl-1_0_0 # Needed for clean upgrade from former openssl-1_1_0, boo#1081335 @@ -102,9 +100,8 @@ Summary: Development files for OpenSSL Requires: libopenssl3 = %{version} Requires: pkgconfig(zlib) Recommends: %{name} = %{version} -# Conflicting names with libopenssl-1_1-devel -Conflicts: libopenssl-1_1-devel -Conflicts: libressl-devel +Provides: ssl-devel +Conflicts: 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