!1 p11-kit:fix update problem
Merge pull request !1 from openeuler-basic/next
This commit is contained in:
commit
4d4a59adcd
22
p11-kit.spec
22
p11-kit.spec
@ -1,6 +1,6 @@
|
|||||||
Name: p11-kit
|
Name: p11-kit
|
||||||
Version: 0.23.14
|
Version: 0.23.14
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: Provides a way to load and enumerate PKCS#11 modules.
|
Summary: Provides a way to load and enumerate PKCS#11 modules.
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://p11-glue.freedesktop.org/p11-kit.html
|
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
|
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
|
%description
|
||||||
Provides a way to load and enumerate PKCS#11 modules.
|
Provides a way to load and enumerate PKCS#11 modules.
|
||||||
Provides a standard configuration setup for installing
|
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
|
Also solves problems with coordinating the use of PKCS#11
|
||||||
by different components or libraries living in the same process.
|
by different components or libraries living in the same process.
|
||||||
|
|
||||||
Provides: %{name}-server
|
|
||||||
Obsoletes: %{name}-server
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
@ -59,6 +59,13 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
%description help
|
%description help
|
||||||
This package contains help information of p11-kit.
|
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
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
@ -79,13 +86,13 @@ make check
|
|||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%post trust
|
%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 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun trust
|
%postun trust
|
||||||
if [ $1 -eq 0 ]; then
|
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
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -128,6 +135,9 @@ fi
|
|||||||
%{_libexecdir}/p11-kit/trust-extract-compat
|
%{_libexecdir}/p11-kit/trust-extract-compat
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Dec 28 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.23.14-5
|
||||||
|
- fix update problem
|
||||||
|
|
||||||
* Fri Dec 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.23.14-4
|
* Fri Dec 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.23.14-4
|
||||||
- Add missing Requires
|
- Add missing Requires
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user