Fix baselibs.conf file

Change-Id: I277af072363fb8642f213f71c396ceae1dc789d4

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index 2502c17..18e480d 100644 (file)
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -2,5 +2,6 @@
 # refs: https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf
 arch x86_64 targets i586:64bit
 
-libopenssl
+libopenssl11
+       provides "libopenssl1.1-<targettype>"
     +/

diff --git a/packaging/openssl1.1.spec b/packaging/openssl1.1.spec
index 365f2ee..2f89bc7 100644 (file)
--- a/packaging/openssl1.1.spec
+++ b/packaging/openssl1.1.spec
@@ -9,6 +9,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}
 
 %description
 The OpenSSL Project is a collaborative effort to develop a robust,
@@ -19,11 +20,11 @@ by a worldwide community of volunteers that use the Internet to
 communicate, plan, and develop the OpenSSL toolkit and its related
 documentation.
 
-%package -n lib%{name}
+%package -n libopenssl11
 Summary:    Secure Sockets Layer and cryptography libraries
 Group:      Security/Crypto Libraries
 
-%description -n lib%{name}
+%description -n libopenssl11
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, full-featured, and open source toolkit implementing
 the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
@@ -35,7 +36,7 @@ documentation.
 %package -n lib%{name}-devel
 Summary:    Secure Sockets Layer and cryptography libraries mandatory for Development
 Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
+Requires:   libopenssl11 = %{version}-%{release}
 Requires:   zlib-devel
 Conflicts:  libopenssl-devel
 
@@ -95,14 +96,14 @@ mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{openssldir}/openssl
 %{openssldir}/*.cnf*
 %{openssldir}/misc
 
-%files -n lib%{name}
+%files -n libopenssl11
 %manifest %{name}.manifest
 %license LICENSE
 %license LICENSE.Apache-2.0
 %{_libdir}/*.so.*
 %{_libdir}/engines-1.1/*.so
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
+%post -n libopenssl11 -p /sbin/ldconfig
+%postun -n libopenssl11 -p /sbin/ldconfig
 
 %files -n lib%{name}-devel
 %manifest %{name}.manifest