Accepting request 1095609 from security:tls

- 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/1095609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-1_1?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2023-06-27 21:16:16 +00:00 committed by Git OBS Bridge
parent 28cda60acd
commit 2f3c226fb9
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 20 15:18:56 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
- 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 <otto.hollmann@suse.com> Wed May 31 08:31:09 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>

View File

@ -134,6 +134,7 @@ Patch79: openssl-1_1-Fix-AES-GCM-on-Power-8-CPUs.patch
Patch80: openssl-1_1-openssl-config.patch Patch80: openssl-1_1-openssl-config.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Provides: ssl
Requires: libopenssl1_1 = %{version}-%{release} Requires: libopenssl1_1 = %{version}-%{release}
%if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550 %if 0%{?sle_version} >= 150400 || 0%{?suse_version} >= 1550
Requires: crypto-policies Requires: crypto-policies
@ -180,8 +181,7 @@ Requires: libopenssl1_1 = %{version}
Requires: pkgconfig(zlib) Requires: pkgconfig(zlib)
Recommends: %{name} = %{version} Recommends: %{name} = %{version}
Conflicts: ssl-devel Conflicts: ssl-devel
# Conflicting names with libopenssl-3-devel Provides: ssl-devel
Conflicts: libopenssl-3-devel
# Needed for clean upgrade from former openssl-1_1_0, boo#1081335 # Needed for clean upgrade from former openssl-1_1_0, boo#1081335
Obsoletes: libopenssl-1_1_0-devel Obsoletes: libopenssl-1_1_0-devel
# Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499 # Needed for clean upgrade from SLE-12 openssl-1_0_0, bsc#1158499