Sync from SUSE:SLFO:Main openssl-ibmca revision ab83b45fbaacfd4505195b48c034e21c

openssl-ibmca.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jul 16 06:11:44 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file
+  * Replaced hard-coded '/usr/share' with %{_datadir}  
+
+-------------------------------------------------------------------
+Mon Jul 15 08:18:35 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file (bsc#1227537)
+  * 'rpm.install.excludedocs = yes' in zypp.conf excludes the /usr/share/doc/.. 
+  * Added a check, if there is is /usr/share/doc file to be editted.
+
 -------------------------------------------------------------------
 Wed Apr 17 14:04:14 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 

openssl-ibmca.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package openssl-ibmca
 #
-# Copyright (c) 2018-2024 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %global enginesdir %(pkg-config --variable=enginesdir libcrypto)
 %global modulesdir %(pkg-config --variable=modulesdir libcrypto)
 
@@ -56,20 +57,20 @@ BuildRequires:  automake
 BuildRequires:  libtool
 ###
 %if "%{flavor}" != "openssl1_1"
-BuildRequires:  libopenssl3
-BuildRequires:  libopenssl-3-devel
 BuildRequires:  libica-devel >= 4.0.0
 BuildRequires:  libica-tools >= 4.0.0
-Requires:       libopenssl3
+BuildRequires:  libopenssl-3-devel
+BuildRequires:  libopenssl3
 Requires:       libica4 >= 4.0.0
+Requires:       libopenssl3
 %else
-BuildRequires:  openssl
-BuildRequires:  libopenssl1_1
-BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  libica-openssl1_1-devel
 BuildRequires:  libica-openssl1_1-tools
-Requires:       libopenssl1_1
+BuildRequires:  libopenssl-1_1-devel
+BuildRequires:  libopenssl1_1
+BuildRequires:  openssl
 Requires:       libica4-openssl1_1
+Requires:       libopenssl1_1
 %endif
 ###
 ExclusiveArch:  s390x
@@ -161,9 +162,11 @@ cp -p %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt %{sslengcnf}/openssl-ibmc
 cp -p %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf %{sslengdef}/openssl-ibmca.cnf
 
 %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
+if [ -f "%{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig" ]; then
+   cp -p %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
+   sed -e 's/ossl-modules/engines-3/' %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig > %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig
+   rm %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
+fi
 %endif
 
 %postun