Adjust openssl 1.1 to newly introduced openssl 3.0

- openssl tool is provided by openssl3 package,
- libopenssl1.1-devel conflicts with libopenssl3-devel.

Change-Id: I7e0c087be0387290ece946b2f1a44647c82425ef

diff --git a/packaging/openssl1.1.spec b/packaging/openssl1.1.spec
index 890ba34..e0459b3 100644 (file)
--- a/packaging/openssl1.1.spec
+++ b/packaging/openssl1.1.spec
@@ -10,7 +10,7 @@ Group:      Security/Crypto Libraries
 Url:        https://www.openssl.org/
 Source0:    ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
-Requires:   libopenssl11 = %{version}-%{release}
+Requires:   openssl3
 
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -39,7 +39,7 @@ Summary:    Secure Sockets Layer and cryptography libraries mandatory for Develo
 Group:      Development/Libraries
 Requires:   libopenssl11 = %{version}-%{release}
 Requires:   zlib-devel
-Conflicts:  libopenssl-devel
+Conflicts:  libopenssl3-devel
 
 %description -n lib%{name}-devel
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -95,12 +95,8 @@ mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{openssldir}/openssl
 
 %files
 %manifest %{name}.manifest
-%license LICENSE
-%license LICENSE.Apache-2.0
-%{_bindir}/openssl
-%{_bindir}/c_rehash
-%{openssldir}/*.cnf*
-%{openssldir}/misc
+%exclude %{_bindir}
+%exclude %{openssldir}
 
 %files -n libopenssl11
 %manifest %{name}.manifest
@@ -108,6 +104,7 @@ mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{openssldir}/openssl
 %license LICENSE.Apache-2.0
 %{_libdir}/*.so.*
 %{_libdir}/engines-1.1/*.so
+%{openssldir}/*.cnf*
 %post -n libopenssl11 -p /sbin/ldconfig
 %postun -n libopenssl11 -p /sbin/ldconfig