Revert; change needs to be synced with openssl 3.0 update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-1_1?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2023-06-28 08:21:17 +00:00 committed by Git OBS Bridge
parent 2f3c226fb9
commit 6de92f70b8
2 changed files with 2 additions and 9 deletions

View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
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>

View File

@ -134,7 +134,6 @@ 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
@ -181,7 +180,8 @@ Requires: libopenssl1_1 = %{version}
Requires: pkgconfig(zlib)
Recommends: %{name} = %{version}
Conflicts: ssl-devel
Provides: ssl-devel
# Conflicting names with libopenssl-3-devel
Conflicts: libopenssl-3-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