diff --git a/p11-kit.spec b/p11-kit.spec index fafe21f870e4b9a9865edc49468df011aeae5830..a5da2647b69228c1343f3d9b1ad9d26048eb5c81 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,6 +1,6 @@ Name: p11-kit Version: 0.23.14 -Release: 4 +Release: 5 Summary: Provides a way to load and enumerate PKCS#11 modules. License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html @@ -25,6 +25,9 @@ Patch6013: modules-Fix-index-used-in-call-to-p11_dict_remove.patch BuildRequires: gcc libtasn1-devel >= 2.3 libffi-devel gtk-doc systemd-devel pkgconfig(glib-2.0) libxslt +Provides: p11-kit-server = %{version}-%{release} +Obsoletes: p11-kit-server < %{version}-%{release} + %description Provides a way to load and enumerate PKCS#11 modules. Provides a standard configuration setup for installing @@ -32,9 +35,6 @@ PKCS#11 modules in such a way that they're discoverable. Also solves problems with coordinating the use of PKCS#11 by different components or libraries living in the same process. -Provides: %{name}-server -Obsoletes: %{name}-server - %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} @@ -59,6 +59,13 @@ Requires: %{name} = %{version}-%{release} %description help This package contains help information of p11-kit. +%define multilib_arches ppc64 sparc64 x86_64 ppc64le +%ifarch %{multilib_arches} +%define alt_ckbi libnssckbi.so.%{_arch} +%else +%define alt_ckbi libnssckbi.so +%endif + %prep %autosetup -p1 @@ -79,13 +86,13 @@ make check %post -p /sbin/ldconfig %post trust -%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so libnssckbi.so %{_libdir}/pkcs11/p11-kit-trust.so 30 +%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 %postun -p /sbin/ldconfig %postun trust if [ $1 -eq 0 ]; then - %{_sbindir}/update-alternatives --remove libnssckbi.so %{_libdir}/pkcs11/p11-kit-trust.so + %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so fi %files @@ -128,6 +135,9 @@ fi %{_libexecdir}/p11-kit/trust-extract-compat %changelog +* Sat Dec 28 2019 openEuler Buildteam - 0.23.14-5 +- fix update problem + * Fri Dec 20 2019 openEuler Buildteam - 0.23.14-4 - Add missing Requires