diff --git a/_multibuild b/_multibuild
index d8cd31d..52d8253 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,5 +1,5 @@
- openssl3
+ openssl1_1
engine
provider
diff --git a/openssl-ibmca.changes b/openssl-ibmca.changes
index 522063d..1ec13a8 100644
--- a/openssl-ibmca.changes
+++ b/openssl-ibmca.changes
@@ -1,16 +1,16 @@
-------------------------------------------------------------------
-Wed Apr 17 10:14:00 UTC 2024 - Nikolay Gueorguiev
+Wed Apr 17 14:04:14 UTC 2024 - Nikolay Gueorguiev
- Amended the .spec file
- Changed the package names
- +------------+---------------------------------+--------------------------+
- | Flavor | Package name | Note |
- +------------+---------------------------------+--------------------------+
- | '' | openssl1_1-ibmca | openssl1 flavor |
- | engine | openssl-ibmca-engine | Only engine |
- | provider | openssl-ibmca-provider | Only provider |
- | openssl3 | openssl-ibmca | Both engine and provider |
- +------------+---------------------------------+--------------------------+
+ +-------------+---------------------------------+--------------------------+
+ | Flavor | Package name | Note |
+ +-------------+---------------------------------+--------------------------+
+ | '' | openssl-ibmca | Both engine and provider |
+ | openssl1_1 | openssl1_1-ibmca | openssl1 flavor |
+ | engine | openssl-ibmca-engine | Only engine |
+ | provider | openssl-ibmca-provider | Only provider |
+ +-------------+---------------------------------+--------------------------+
-------------------------------------------------------------------
Wed Apr 17 08:41:08 UTC 2024 - Nikolay Gueorguiev
diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec
index a65485c..4971a26 100644
--- a/openssl-ibmca.spec
+++ b/openssl-ibmca.spec
@@ -1,5 +1,5 @@
#
-# spec file for package openssl-ibmca
+# spec file for package openssl1_1-ibmca
#
# Copyright (c) 2024 SUSE LLC
#
@@ -24,13 +24,13 @@
%define flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == ""
+%if "%{flavor}" == "openssl1_1"
%global sslengcnf %{_sysconfdir}/ssl/engines1.1.d
%global sslengdef %{_sysconfdir}/ssl/engdef1.1.d
Name: openssl1_1-ibmca
%endif
-%if "%{flavor}" == "openssl3"
+%if "%{flavor}" == ""
Name: openssl-ibmca
%endif
@@ -56,7 +56,7 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
###
-%if "%{flavor}" != ""
+%if "%{flavor}" != "openssl1_1"
BuildRequires: libica-devel >= 4.0.0
BuildRequires: libica-tools >= 4.0.0
BuildRequires: libopenssl-3-devel
@@ -75,7 +75,7 @@ Requires: libopenssl1_1
###
ExclusiveArch: s390x
-%if "%{flavor}" == ""
+%if "%{flavor}" == "openssl1_1"
Patch001: openssl1-rename-libica-files.patch
%endif
@@ -91,7 +91,7 @@ to libica, a library enabling the IBM s390/x CPACF crypto instructions.
export CFLAGS="%{optflags}"
export CPPFLAGS="%{optflags}"
-%if "%{flavor}" == "openssl3"
+%if "%{flavor}" == ""
%configure \
--libdir=%{modulesdir}
mkdir -p %{buildroot}/%{enginesdir}
@@ -109,7 +109,7 @@ export CPPFLAGS="%{optflags}"
--libdir=%{modulesdir}
%endif
-%if "%{flavor}" == ""
+%if "%{flavor}" == "openssl1_1"
%configure \
--libdir=%{enginesdir}
%endif
@@ -125,11 +125,11 @@ sed -i -e "/^dynamic_path/s, = .*/, = %{enginesdir}/," src/engine/openssl.cnf.sa
%make_install
-%if "%{flavor}" == ""
+%if "%{flavor}" == "openssl1_1"
rm -f %{buildroot}/%{enginesdir}/ibmca-provider.*
%endif
-%if "%{flavor}" == "openssl3"
+%if "%{flavor}" == ""
mkdir -p %{buildroot}/%{enginesdir}
mv %{buildroot}/%{modulesdir}/ibmca.* %{buildroot}/%{enginesdir}/
%endif
@@ -161,7 +161,7 @@ mkdir -p %{sslengdef}
cp -p %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt %{sslengcnf}/openssl-ibmca.cnf
cp -p %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf %{sslengdef}/openssl-ibmca.cnf
-%if "%{flavor}" == "openssl3"
+%if "%{flavor}" == ""
cp -p /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
sed -e 's/ossl-modules/engines-3/' /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig > /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig
rm /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
@@ -180,7 +180,7 @@ fi
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
%{_datadir}/%{name}/openssl-ibmca.enginedef.cnf
-%if "%{flavor}" == "openssl3"
+%if "%{flavor}" == ""
%doc src/engine/ibmca-engine-opensslconfig
%doc src/provider/ibmca-provider-opensslconfig
%doc src/engine/openssl.cnf.sample
@@ -200,7 +200,7 @@ fi
%{enginesdir}/ibmca.*
%{_mandir}/man5/ibmca.5%{?ext_man}
%endif
-%if "%{flavor}" == ""
+%if "%{flavor}" == "openssl1_1"
%doc src/engine/openssl.cnf.sample
%{enginesdir}/ibmca.*
%{_mandir}/man5/ibmca.5%{?ext_man}