diff --git a/_multibuild b/_multibuild
deleted file mode 100644
index fb1e135..0000000
--- a/_multibuild
+++ /dev/null
@@ -1,5 +0,0 @@
-
- openssl1
- engine
- provider
-
diff --git a/openssl-ibmca.changes b/openssl-ibmca.changes
index 6f3e2c9..deca8cd 100644
--- a/openssl-ibmca.changes
+++ b/openssl-ibmca.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 4 04:37:18 UTC 2024 - Nikolay Gueorguiev
+
+- Amended the .spec file (bsc#1221627)
+ * Removed the flavors
+
-------------------------------------------------------------------
Mon Mar 18 19:18:47 UTC 2024 - Nikolay Gueorguiev
diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec
index 8709b6b..89539ad 100644
--- a/openssl-ibmca.spec
+++ b/openssl-ibmca.spec
@@ -16,27 +16,7 @@
#
-%define flavor @BUILD_FLAVOR@%{nil}
-
-%if "%{flavor}" == ""
%define openssl3 1
-%define provider 0
-%endif
-
-%if "%{flavor}" == "openssl1"
-%define openssl3 0
-%define provider 0
-%endif
-
-%if "%{flavor}" == "engine"
-%define openssl3 1
-%define provider 0
-%endif
-
-%if "%{flavor}" == "provider"
-%define openssl3 1
-%define provider 1
-%endif
%global enginesdir %(pkg-config --variable=enginesdir libcrypto)
%global modulesdir %(pkg-config --variable=modulesdir libcrypto)
@@ -50,7 +30,6 @@ Group: Hardware/Other
URL: https://github.com/opencryptoki/openssl-ibmca
Source: https://github.com/opencryptoki/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: engine_section.txt
-Source2: _multibuild
###
BuildRequires: autoconf
BuildRequires: automake
@@ -79,35 +58,23 @@ to libica, a library enabling the IBM s390/x CPACF crypto instructions.
export CFLAGS="%{optflags}"
export CPPFLAGS="%{optflags}"
-%if %{provider}
- %configure \
- --disable-engine \
+%configure \
--libdir=%{modulesdir}
-%else
- %configure \
- --disable-provider \
- --libdir=%{enginesdir}
-%endif
+
+mkdir -p %{buildroot}/%{enginesdir}
%make_build
%install
-%if %{provider}
-#
-###
-#
-%else
# Update the sample config file so that the dynamic path points
# to the correct version of the engines directory.
sed -i -e "/^dynamic_path/s, = .*/, = %{enginesdir}/," src/engine/openssl.cnf.sample
-%endif
%make_install
-%if %{provider}
+
rm -f %{buildroot}/%{modulesdir}/ibmca-provider.la
-%else
+mv %{buildroot}/%{modulesdir}/ibmca.* %{buildroot}/%{enginesdir}/
rm -f %{buildroot}/%{enginesdir}/ibmca.la
-%endif
# This file contains the declaration of the ibmca engine section. It
# needs to be on the "real" file system when the postinstall scriptlet
@@ -156,13 +123,10 @@ fi
%{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
%{_datadir}/%{name}/openssl-ibmca.enginedef.cnf
%if %{openssl3}
- %if %{provider}
%{modulesdir}/ibmca-provider.*
%{_mandir}/man5/ibmca-provider.5%{?ext_man}
- %else
%{enginesdir}/ibmca.*
%{_mandir}/man5/ibmca.5%{?ext_man}
- %endif
%else
%{enginesdir}/ibmca.*
%{_mandir}/man5/ibmca.5%{?ext_man}