Skip to content

Commit 89b6459

Browse files
authored
openssl: move SymCrypt and SymCrypt-OpenSSL Recommends from main package to libs (#12176)
openssl has a Recommends on SymCrypt and SymCrypt-OpenSSL. However, it's actually the subpackage openssl-libs that needs these and we have a customer that sees these not being installed if they only install openssl-libs on a minimal container. This change moves the Recommends from the main package to the libs subpackage
1 parent 44d0297 commit 89b6459

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

SPECS/openssl/openssl.spec

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Summary: Utilities from the general purpose cryptography library with TLS implementation
1010
Name: openssl
1111
Version: 3.3.2
12-
Release: 1%{?dist}
12+
Release: 2%{?dist}
1313
Vendor: Microsoft Corporation
1414
Distribution: Azure Linux
1515
Source: https://github.com/openssl/openssl/releases/download/openssl-%{version}/openssl-%{version}.tar.gz
@@ -90,9 +90,6 @@ BuildRequires: perl(Test::More)
9090

9191
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
9292

93-
Recommends: SymCrypt
94-
Recommends: SymCrypt-OpenSSL
95-
9693
%description
9794
The OpenSSL toolkit provides support for secure communications between
9895
machines. OpenSSL includes a certificate management tool and shared
@@ -101,6 +98,8 @@ protocols.
10198

10299
%package libs
103100
Summary: A general purpose cryptography library with TLS implementation
101+
Recommends: SymCrypt
102+
Recommends: SymCrypt-OpenSSL
104103

105104
%description libs
106105
OpenSSL is a toolkit for supporting cryptography. The openssl-libs
@@ -358,6 +357,9 @@ install -m644 %{SOURCE9} \
358357
%ldconfig_scriptlets libs
359358

360359
%changelog
360+
* Fri Jan 31 2025 Tobias Brick <[email protected]> - 3.3.2-2
361+
- Move SymCrypt and SymCrypt-OpenSSL Recommends from main package to libs
362+
361363
* Thu Sep 19 2024 Tobias Brick <[email protected]> - 3.3.2-1
362364
- Upgrade to 3.3.2
363365

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
170170
autoconf-2.72-2.azl3.noarch.rpm
171171
automake-1.16.5-2.azl3.noarch.rpm
172172
ocaml-srpm-macros-9-4.azl3.noarch.rpm
173-
openssl-3.3.2-1.azl3.aarch64.rpm
174-
openssl-devel-3.3.2-1.azl3.aarch64.rpm
175-
openssl-libs-3.3.2-1.azl3.aarch64.rpm
176-
openssl-perl-3.3.2-1.azl3.aarch64.rpm
177-
openssl-static-3.3.2-1.azl3.aarch64.rpm
173+
openssl-3.3.2-2.azl3.aarch64.rpm
174+
openssl-devel-3.3.2-2.azl3.aarch64.rpm
175+
openssl-libs-3.3.2-2.azl3.aarch64.rpm
176+
openssl-perl-3.3.2-2.azl3.aarch64.rpm
177+
openssl-static-3.3.2-2.azl3.aarch64.rpm
178178
libcap-2.69-1.azl3.aarch64.rpm
179179
libcap-devel-2.69-1.azl3.aarch64.rpm
180180
debugedit-5.0-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
170170
autoconf-2.72-2.azl3.noarch.rpm
171171
automake-1.16.5-2.azl3.noarch.rpm
172172
ocaml-srpm-macros-9-4.azl3.noarch.rpm
173-
openssl-3.3.2-1.azl3.x86_64.rpm
174-
openssl-devel-3.3.2-1.azl3.x86_64.rpm
175-
openssl-libs-3.3.2-1.azl3.x86_64.rpm
176-
openssl-perl-3.3.2-1.azl3.x86_64.rpm
177-
openssl-static-3.3.2-1.azl3.x86_64.rpm
173+
openssl-3.3.2-2.azl3.x86_64.rpm
174+
openssl-devel-3.3.2-2.azl3.x86_64.rpm
175+
openssl-libs-3.3.2-2.azl3.x86_64.rpm
176+
openssl-perl-3.3.2-2.azl3.x86_64.rpm
177+
openssl-static-3.3.2-2.azl3.x86_64.rpm
178178
libcap-2.69-1.azl3.x86_64.rpm
179179
libcap-devel-2.69-1.azl3.x86_64.rpm
180180
debugedit-5.0-2.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,12 @@ npth-debuginfo-1.6-4.azl3.aarch64.rpm
285285
npth-devel-1.6-4.azl3.aarch64.rpm
286286
ntsysv-1.25-1.azl3.aarch64.rpm
287287
ocaml-srpm-macros-9-4.azl3.noarch.rpm
288-
openssl-3.3.2-1.azl3.aarch64.rpm
289-
openssl-debuginfo-3.3.2-1.azl3.aarch64.rpm
290-
openssl-devel-3.3.2-1.azl3.aarch64.rpm
291-
openssl-libs-3.3.2-1.azl3.aarch64.rpm
292-
openssl-perl-3.3.2-1.azl3.aarch64.rpm
293-
openssl-static-3.3.2-1.azl3.aarch64.rpm
288+
openssl-3.3.2-2.azl3.aarch64.rpm
289+
openssl-debuginfo-3.3.2-2.azl3.aarch64.rpm
290+
openssl-devel-3.3.2-2.azl3.aarch64.rpm
291+
openssl-libs-3.3.2-2.azl3.aarch64.rpm
292+
openssl-perl-3.3.2-2.azl3.aarch64.rpm
293+
openssl-static-3.3.2-2.azl3.aarch64.rpm
294294
p11-kit-0.25.0-1.azl3.aarch64.rpm
295295
p11-kit-debuginfo-0.25.0-1.azl3.aarch64.rpm
296296
p11-kit-devel-0.25.0-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,12 @@ npth-debuginfo-1.6-4.azl3.x86_64.rpm
293293
npth-devel-1.6-4.azl3.x86_64.rpm
294294
ntsysv-1.25-1.azl3.x86_64.rpm
295295
ocaml-srpm-macros-9-4.azl3.noarch.rpm
296-
openssl-3.3.2-1.azl3.x86_64.rpm
297-
openssl-debuginfo-3.3.2-1.azl3.x86_64.rpm
298-
openssl-devel-3.3.2-1.azl3.x86_64.rpm
299-
openssl-libs-3.3.2-1.azl3.x86_64.rpm
300-
openssl-perl-3.3.2-1.azl3.x86_64.rpm
301-
openssl-static-3.3.2-1.azl3.x86_64.rpm
296+
openssl-3.3.2-2.azl3.x86_64.rpm
297+
openssl-debuginfo-3.3.2-2.azl3.x86_64.rpm
298+
openssl-devel-3.3.2-2.azl3.x86_64.rpm
299+
openssl-libs-3.3.2-2.azl3.x86_64.rpm
300+
openssl-perl-3.3.2-2.azl3.x86_64.rpm
301+
openssl-static-3.3.2-2.azl3.x86_64.rpm
302302
p11-kit-0.25.0-1.azl3.x86_64.rpm
303303
p11-kit-debuginfo-0.25.0-1.azl3.x86_64.rpm
304304
p11-kit-devel-0.25.0-1.azl3.x86_64.rpm

0 commit comments

Comments
 (0)