From c919c280feedb06125bf7c49d3d9fa21117abfcee80b51681c4635aa052f8771 Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Tue, 2 May 2023 07:54:47 +0000 Subject: [PATCH] Accepting request 1083947 from home:ngueorguiev:branches:security:tls - Updated the .spec file * uses a flag openssl3 (1 or 0) to include or not the openssl3 libraries OBS-URL: https://build.opensuse.org/request/show/1083947 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-ibmca?expand=0&rev=49 --- openssl-ibmca.changes | 6 ++++++ openssl-ibmca.spec | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/openssl-ibmca.changes b/openssl-ibmca.changes index 94c09b0..f441a7c 100644 --- a/openssl-ibmca.changes +++ b/openssl-ibmca.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 2 07:49:24 UTC 2023 - Nikolay Gueorguiev + +- Updated the .spec file + * uses a flag openssl3 (1 or 0) to include or not the openssl3 libraries + ------------------------------------------------------------------- Tue Apr 25 12:47:39 UTC 2023 - Nikolay Gueorguiev diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec index a218242..8b3ab2c 100644 --- a/openssl-ibmca.spec +++ b/openssl-ibmca.spec @@ -16,6 +16,8 @@ # +%define openssl3 1 + %global enginesdir %(pkg-config --variable=enginesdir libcrypto) Name: openssl-ibmca @@ -36,9 +38,14 @@ BuildRequires: libica >= 4.0.0 BuildRequires: libica-devel >= 4.0.0 BuildRequires: libica-tools >= 4.0.0 BuildRequires: libtool -BuildRequires: openssl-devel Requires: libica >= 4.0.0 +%if %{openssl3} +BuildRequires: openssl-devel > 3.0.0 +Requires: openssl > 3.0.0 +%else +BuildRequires: openssl-devel Requires: openssl +%endif ExclusiveArch: s390x %description @@ -85,8 +92,10 @@ grep -v "^#" src/engine/openssl.cnf.sample | \ SSLENGCNF=%{_sysconfdir}/ssl/engines.d SSLENGDEF=%{_sysconfdir}/ssl/engdef.d -mkdir -p ${SSLENGCNF} -mkdir -p ${SSLENGDEF} +%if %{openssl3} + mkdir -p ${SSLENGCNF} + mkdir -p ${SSLENGDEF} +%endif cp -p %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt ${SSLENGCNF}/openssl-ibmca.cnf cp -p %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf ${SSLENGDEF}/openssl-ibmca.cnf @@ -109,9 +118,10 @@ fi %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf %{enginesdir}/ibmca.* -/usr/lib64/engines-3/ibmca-provider.la -/usr/lib64/engines-3/ibmca-provider.so %{_mandir}/man5/ibmca.5%{?ext_man} -%{_mandir}/man5/ibmca-provider.5.gz +%if %{openssl3} + %{_mandir}/man5/ibmca-provider.5%{?ext_man} + %{enginesdir}/ibmca-provider.* +%endif %changelog