- use upstream tmpfiles config
This commit is contained in:
parent
d660478c4e
commit
04e1581164
@ -1 +0,0 @@
|
||||
D /var/lock/opencryptoki 0770 root pkcs11 -
|
@ -1,14 +1,11 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: opencryptoki
|
||||
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
|
||||
Version: 3.8.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: CPL
|
||||
Group: System Environment/Base
|
||||
URL: http://sourceforge.net/projects/opencryptoki
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source1: %{name}-tmpfiles.conf
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=732756
|
||||
Patch0: %{name}-2.4-group.patch
|
||||
# do not install pkcsep11_migrate.1 and pkcscca.1 when it's not enabled
|
||||
@ -186,21 +183,6 @@ configured with Enterprise PKCS#11 (EP11) firmware.
|
||||
|
||||
#%patch100 -p1 -b .no-undefined
|
||||
|
||||
# Upstream tarball has unnecessary executable perms set on the sources
|
||||
find . -name '*.[ch]' -print0 | xargs -0 chmod -x
|
||||
|
||||
# append token specific subdirs to tmpfiles.d config
|
||||
token_subdirs="icsf swtok tpm"
|
||||
%ifarch s390 s390x
|
||||
token_subdirs="$token_subdirs lite ccatok ep11tok"
|
||||
%endif
|
||||
|
||||
cp -p %{SOURCE1} %{name}-tmpfiles.conf
|
||||
for d in $token_subdirs
|
||||
do
|
||||
echo "D /var/lock/opencryptoki/$d 0770 root pkcs11 -" >> %{name}-tmpfiles.conf
|
||||
done
|
||||
|
||||
|
||||
%build
|
||||
./bootstrap.sh
|
||||
@ -222,10 +204,6 @@ make install DESTDIR=$RPM_BUILD_ROOT CHGRP=/bin/true
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/stdll/*.la
|
||||
|
||||
# systemd must create /var/lock/opencryptoki
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
|
||||
install -m 0644 %{name}-tmpfiles.conf $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf
|
||||
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
%post swtok -p /sbin/ldconfig
|
||||
@ -349,6 +327,9 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 24 2017 Dan Horák <dan[at]danny.cz> - 3.8.2-2
|
||||
- use upstream tmpfiles config
|
||||
|
||||
* Thu Nov 23 2017 Dan Horák <dan[at]danny.cz> - 3.8.2-1
|
||||
- Rebase to 3.8.2 (#1512678)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user