Accepting request 480948 from home:markkp:branches:security
Fix problem with building on 32bit systems and make libica-devel requirement more generic. OBS-URL: https://build.opensuse.org/request/show/480948 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=59
This commit is contained in:
parent
1e158a83bf
commit
9b51cd5951
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 17 20:50:45 UTC 2017 - mpost@suse.com
|
||||||
|
|
||||||
|
- Modified the spec file to check for systemd in the 32bit postun
|
||||||
|
scriptlet.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Feb 20 19:48:33 UTC 2017 - mpost@suse.com
|
Mon Feb 20 19:48:33 UTC 2017 - mpost@suse.com
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ BuildRequires: bison
|
|||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
BuildRequires: libica3-devel
|
BuildRequires: libica-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: openldap2-devel
|
BuildRequires: openldap2-devel
|
||||||
@ -223,8 +223,15 @@ fi
|
|||||||
%ifarch %openCryptoki_32bit_arch
|
%ifarch %openCryptoki_32bit_arch
|
||||||
|
|
||||||
%postun 32bit
|
%postun 32bit
|
||||||
# remove the openCryptoki start script
|
if [ -L %{_sysconfdir}/pkcs11 ] ; then
|
||||||
|
rm %{_sysconfdir}/pkcs11
|
||||||
|
fi
|
||||||
|
%if %{uses_systemd}
|
||||||
|
%{service_del_postun pkcsslotd.service}
|
||||||
|
%else
|
||||||
|
%{restart_on_update pkcsslotd}
|
||||||
%{insserv_cleanup}
|
%{insserv_cleanup}
|
||||||
|
%endif
|
||||||
|
|
||||||
%post 32bit
|
%post 32bit
|
||||||
# Old library name links
|
# Old library name links
|
||||||
|
Loading…
Reference in New Issue
Block a user