From d8dd3b927c00c7a9b2a5c07401e393073d88a2cc Mon Sep 17 00:00:00 2001
From: hzero1996 <wangcheng156@huawei.com>
Date: Sun, 29 Jan 2023 11:37:49 +0000
Subject: [PATCH] move the content of compat-openssl11-libs to compat-openssl11

---
 compat-openssl11.spec | 48 +++++++++++--------------------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/compat-openssl11.spec b/compat-openssl11.spec
index 89a9de6..87db2c3 100644
--- a/compat-openssl11.spec
+++ b/compat-openssl11.spec
@@ -1,7 +1,7 @@
 %define soversion 1.1
 Name:        compat-openssl11
 Version:     1.1.1m
-Release:     2
+Release:     3
 Epoch:       1
 Summary:     Cryptography and SSL/TLS Toolkit
 License:     OpenSSL and SSLeay
@@ -99,27 +99,21 @@ Patch88:     backport-X509-x509_req.c-Set-modified-flag-when-X509_req_info.patch
 Patch89:     backport-ssl_cipher_process_rulestr-don-t-read-outside-rule_s.patch
 
 BuildRequires: gcc perl make lksctp-tools-devel coreutils util-linux zlib-devel
-
-%description
-OpenSSL is a robust, commercial-grade, and full-featured toolkit for the
-Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols.
-
-%package libs
 Summary:      A general purpose cryptography library with TLS implementation
 Group:        System Environment/Libraries
 Requires:     ca-certificates >= 2008-5
 Requires:     crypto-policies >= 20180730
-Conflicts:    openssl-libs < 1:3.0
-
-%description libs
-The openssl-libs package contains the libraries that are used
-by various applications which support cryptographic algorithms
-and protocols.
+Conflicts:    openssl-libs < 1:3.0 openssl < 1:3.0
 
+%description
+The OpenSSL toolkit provides support for secure communications between
+machines. This version of OpenSSL package contains only the libraries
+from the 1.1.1 version and is provided for compatibility with previous
+releases.
 
 %package devel
 Summary:   Development files for openssl
-Requires:  %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:  %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: krb5-devel zlib-devel pkgconfig
 Conflicts: openssl-devel
 %description devel
@@ -150,16 +144,6 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS"
 
 %make_build all
 
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{version}.hmac \
-    ln -sf .libcrypto.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{soversion}.hmac \
-    crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{version}.hmac \
-    ln -sf .libssl.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{soversion}.hmac \
-%{nil}
-
 %install
 
 %make_install
@@ -192,22 +176,13 @@ rm -rf $RPM_BUILD_ROOT/%{_bindir}
 %check
 LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 export LD_LIBRARY_PATH
-crypto/fips/fips_standalone_hmac libcrypto.so.%{soversion} >.libcrypto.so.%{soversion}.hmac
-ln -s .libcrypto.so.%{soversion}.hmac .libcrypto.so.hmac
-crypto/fips/fips_standalone_hmac libssl.so.%{soversion} >.libssl.so.%{soversion}.hmac
-ln -s .libssl.so.%{soversion}.hmac .libssl.so.hmac
 OPENSSL_ENABLE_MD5_VERIFY=
 export OPENSSL_ENABLE_MD5_VERIFY
 OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file
 export OPENSSL_SYSTEM_CIPHERS_OVERRIDE
 make test || :
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%files libs
+%files
 %defattr(-,root,root)
 %license LICENSE
 %{_libdir}/libcrypto.so.%{version}
@@ -215,8 +190,6 @@ make test || :
 %{_libdir}/libssl.so.%{version}
 %{_libdir}/libssl.so.%{soversion}
 %{_libdir}/engines-%{soversion}
-%attr(0644,root,root) %{_libdir}/.libcrypto.so.*.hmac
-%attr(0644,root,root) %{_libdir}/.libssl.so.*.hmac
 
 %files devel
 %defattr(-,root,root)
@@ -230,6 +203,9 @@ make test || :
 %ldconfig_scriptlets libs
 
 %changelog
+* Sun Jan 29 2023 wangcheng <wangcheng156@huawei.com> - 1:1.1.1m-3
+- move the content of compat-openssl11-libs to compat-openssl11
+
 * Thu Jan 19 2023 licihua <licihua@huawei.com> - 1:1.1.1m-2
 - Add Conflicts for compat-openssl11-devel compat-openssl11-lib
 
-- 
Gitee