From aae65979124786b82e9ad0ce7f5bfa2c0ba8227c Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Fri, 27 Dec 2019 10:19:42 +0800 Subject: [PATCH] modify obsoletes --- openssl.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openssl.spec b/openssl.spec index 8a84337..704604b 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1d -Release: 1 +Release: 2 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -19,7 +19,8 @@ BuildRequires: gcc make lksctp-tools-devel coreutils util-linux zlib-devel Requires: coreutils perl ca-certificates crypto-policies Recommends: openssl-pkcs11%{?_isa} -Obsoletes: openssl-libs oopenssl-libs%{?_isa} penssl-perl penssl-perl%{?_isa} +Obsoletes: openssl-libs < %{epoch}:%{version}-%{release} openssl-libs%{?_isa} < %{epoch}:%{version}-%{release} +Obsoletes: openssl-perl < %{epoch}:%{version}-%{release} openssl-perl%{?_isa} < %{epoch}:%{version}-%{release} Provides: openssl-libs = %{epoch}:%{version}-%{release} openssl-perl = %{epoch}:%{version}-%{release} Provides: openssl-libs%{?_isa} = %{epoch}:%{version}-%{release} openssl-perl%{_isa} = %{epoch}:%{version}-%{release} @@ -31,8 +32,8 @@ Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. Summary: Development files for openssl Requires: %{name} = %{epoch}:%{version}-%{release} Requires: krb5-devel zlib-devel pkgconfig -Obsoletes: openssl-static openssl-static%{?_isa} -Provides: openssl-static openssl-static%{?_isa} +Obsoletes: openssl-static < %{epoch}:%{version}-%{release} openssl-static%{?_isa} < %{epoch}:%{version}-%{release} +Provides: openssl-static = %{epoch}:%{version}-%{release} openssl-static%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. @@ -153,6 +154,9 @@ make test || : %changelog +* Fri Dec 27 2019 openEuler Buildteam - 1:1.1.1d-2 +- modify obsoletes + * Mon Dec 16 2019 openEuler Buildteam - 1:1.1.1d-1 - update to 1:1.1.1d -- Gitee