From 228c4641686f370de03e37383f591378e004ba8fe798f6f026e9c493b1d9f37d Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Fri, 19 May 2023 09:04:21 +0000 Subject: [PATCH] Accepting request 1087911 from home:aplanas:branches:security - Merge subpackages lib and devel into the main one OBS-URL: https://build.opensuse.org/request/show/1087911 OBS-URL: https://build.opensuse.org/package/show/security/tpm2-pkcs11?expand=0&rev=16 --- tpm2-pkcs11.changes | 4 ++-- tpm2-pkcs11.spec | 46 +++++++++++++-------------------------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/tpm2-pkcs11.changes b/tpm2-pkcs11.changes index 614363f..4c45560 100644 --- a/tpm2-pkcs11.changes +++ b/tpm2-pkcs11.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Wed Apr 19 09:14:04 UTC 2023 - Alberto Planas Dominguez +Thu May 18 15:29:46 UTC 2023 - Alberto Planas Dominguez -- Recommends libtpm2_pkcs11-0 library in a default installation +- Merge subpackages lib and devel into the main one ------------------------------------------------------------------- Thu Feb 16 15:21:43 UTC 2023 - Alberto Planas Dominguez diff --git a/tpm2-pkcs11.spec b/tpm2-pkcs11.spec index f5c3a07..5290e0f 100644 --- a/tpm2-pkcs11.spec +++ b/tpm2-pkcs11.spec @@ -50,34 +50,19 @@ BuildRequires: pkgconfig(tss2-mu) BuildRequires: pkgconfig(tss2-rc) BuildRequires: pkgconfig(tss2-tctildr) BuildRequires: pkgconfig(yaml-0.1) -Recommends: libtpm2_pkcs11-0 = %{version} +# Merge both subpackages +Provides: libtpm2_pkcs11-0 = %{version} +Obsoletes: libtpm2_pkcs11-0 < %{version} +Provides: tpm2-pkcs11-devel = %{version} +Obsoletes: tpm2-pkcs11-devel < %{version} %{?python_enable_dependency_generator} %description -PKCS #11 is a Public-Key Cryptography Standard that defines a standard method to -access cryptographic services from tokens/devices such as hardware security -modules (HSM), smart cards, etc. This project uses a TPM2 device -as the cryptographic token. +tpm2-pkcs11 is a plugin shared library implementing the PKCS #11 +Cryptographic Token Interface (Cryptoki) C API atop of TPM2 devices. -%package -n libtpm2_pkcs11-0 -Summary: A PKCS#11 interface for TPM2 hardware -Group: System/Libraries -Requires: %{name} = %{version} - -%description -n libtpm2_pkcs11-0 -PKCS #11 is a Public-Key Cryptography Standard that defines a standard method to -access cryptographic services from tokens/devices such as hardware security -modules (HSM), smart cards, etc. This project uses a TPM2 device -as the cryptographic token. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries/C and C++ -Requires: libtpm2_pkcs11-0 = %{version} -Provides: libtpm2_pkcs11-devel = %{version}-%{release} - -%description devel -Headers and libraries to build software against %{name}. +%dnl "make install" copies no .h files, a strong indicator that this project is +%dnl an (SLPP-exempt) plugin rather than a "normal" shared library. %prep %autosetup @@ -97,27 +82,22 @@ cd tools %python_install %fdupes %{buildroot} -%post -n libtpm2_pkcs11-0 -p /sbin/ldconfig -%postun -n libtpm2_pkcs11-0 -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %license LICENSE %doc docs/* %dir %{_datadir}/p11-kit/modules %dir %{_datadir}/p11-kit +%dir %{_libdir}/pkcs11 %{_datadir}/p11-kit/modules/tpm2_pkcs11.module %{_sysconfdir}/tpm2_pkcs11 %{_bindir}/tpm2_ptool %{python_sitelib}/tpm2_pkcs11 %{python_sitelib}/*.egg-info - -%files -n libtpm2_pkcs11-0 -%dir %{_libdir}/pkcs11 %{_libdir}/pkcs11/libtpm2_pkcs11.so.%{so_ver}* - -%files devel -%dir %{_libdir}/pkcs11 -%{_libdir}/pkgconfig/tpm2-pkcs11.pc %{_libdir}/pkcs11/libtpm2_pkcs11.so +%{_libdir}/pkgconfig/tpm2-pkcs11.pc %changelog