diff --git a/p11-kit.spec b/p11-kit.spec index a5da2647b69228c1343f3d9b1ad9d26048eb5c81..3746efb6f21da4f6edb5657a9472e27e6c3746de 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,13 +1,12 @@ Name: p11-kit Version: 0.23.14 -Release: 5 +Release: 6 Summary: Provides a way to load and enumerate PKCS#11 modules. License: BSD URL: http://p11-glue.freedesktop.org/p11-kit.html -Source0: %{name}-%{version}.tar.gz -Source1: trust-extract-compat -Source2: p11-kit-client.service +Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}//%{name}-%{version}.tar.gz +Source1: p11-kit-client.service Patch6001: debug-Work-around-cppcheck-false-positives.patch Patch6002: build-Call-va_end-always-when-leaving-the-function.patch @@ -76,8 +75,7 @@ make -j 4 V=1 %install make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules -install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/ -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_userunitdir} +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_userunitdir} find $RPM_BUILD_ROOT -type f -name "*.la" -delete -print %check @@ -132,9 +130,11 @@ fi %ghost %{_libdir}/libnssckbi.so %{_libdir}/pkcs11/p11-kit-trust.so %{_datadir}/p11-kit/modules/p11-kit-trust.module -%{_libexecdir}/p11-kit/trust-extract-compat %changelog +* Fri Jan 10 2019 openEuler Buildteam - 0.23.14-6 +- delete unused file + * Sat Dec 28 2019 openEuler Buildteam - 0.23.14-5 - fix update problem diff --git a/trust-extract-compat b/trust-extract-compat deleted file mode 100644 index 5ca0216c68302ea7e7af830c093cdfdbef32f2e5..0000000000000000000000000000000000000000 --- a/trust-extract-compat +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# This script is a placeholder designed to be replaced when this software -# has been customized for distribution. It should be symlinked linked to the -# distribution's update-ca-certificates or update-ca-trust command as -# appropriate. In the future this script will be called when the PKCS#11 -# trust module is used to modify trust anchors and related data. - -if [ $# -ne 0 ]; then - echo "usage: trust extract-compat" >&2 - exit 2 -fi - -uid=$(id -u) -if [ "$uid" != 0 ]; then - echo "trust: running as non-root user: skip extracting compat bundles" >&2 - exit 0 -fi - -exec /usr/bin/update-ca-trust