diff --git a/build-scripts/package b/build-scripts/package index 0486ba25f..52d3bbcea 100755 --- a/build-scripts/package +++ b/build-scripts/package @@ -136,12 +136,18 @@ case "$PACKAGING" in echo "error: unable to determine selinux-policy package version" exit 1 fi + OPENSSL_VERSION=$(rpm -q --qf '%{VERSION}\n' openssl | sed 's/\([0-9]*.[0-9]*.\)[0-9]*/\10/') + if [ -z "$OPENSSL_VERSION" ]; then + echo "error: unable to determine openssl package version" + exit 1 + fi fi sed \ -e "s/@@VERSION@@/$RPM_VERSION/g" \ -e "s/@@RELEASE@@/$safe_prefix$RPM_RELEASE/g" \ -e "s/@@SELINUX_POLICY_VERSION@@/$SELINUX_POLICY_VERSION/g" \ + -e "s/@@OPENSSL_VERSION@@/$OPENSSL_VERSION/g" \ -e "/^%pre\$/r $PREINSTALL" \ -e "/^%post\$/r $POSTINSTALL" \ -e "/^%preun\$/r $PREREMOVE" \ diff --git a/packaging/cfengine-nova/cfengine-nova.spec.in b/packaging/cfengine-nova/cfengine-nova.spec.in index c4761a833..eaf9f19dd 100644 --- a/packaging/cfengine-nova/cfengine-nova.spec.in +++ b/packaging/cfengine-nova/cfengine-nova.spec.in @@ -29,9 +29,11 @@ Requires: libssl.so.1.1()(64bit) libssl.so.1.1(OPENSSL_1_1_0)(64bit) libssl.so.1 Requires: libcrypto.so.1.1()(64bit) libcrypto.so.1.1(OPENSSL_1_1_0)(64bit) %endif +# libcurl will end up depending on the specific version we build with so list that as a requirement. +# OPENSSL_VERSION is determined in build-scripts/package script in this same project. %if %{?rhel}%{!?rhel:0} > 8 -Requires: libcrypto.so.3()(64bit) libcrypto.so.3(OPENSSL_3.0.0)(64bit) libcrypto.so.3(OPENSSL_3.0.1)(64bit) -Requires: libssl.so.3()(64bit) libssl.so.3(OPENSSL_3.0.0)(64bit) +Requires: libcrypto.so.3()(64bit) libcrypto.so.3(OPENSSL_@@OPENSSL_VERSION@@)(64bit) +Requires: libssl.so.3()(64bit) libssl.so.3(OPENSSL_@@OPENSSL_VERSION@@)(64bit) %endif AutoReqProv: no