rpm: Create swtpm-tools-pkcs11 package

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

diff --git a/dist/swtpm.spec b/dist/swtpm.spec
index 5fc95ffb850106bc4017807a77fe76c2831070b3..50c52bf8c3a4c85a1208024140f2282e44691524 100644 (file)
--- a/dist/swtpm.spec
+++ b/dist/swtpm.spec
@@ -44,6 +44,7 @@ BuildRequires:  libtasn1
 BuildRequires:  selinux-policy-devel
 BuildRequires:  gcc
 BuildRequires:  libseccomp-devel
+BuildRequires:  tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
 
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       libtpms >= 0.6.0
@@ -76,6 +77,16 @@ Requires:       trousers >= 0.3.9 bash gnutls-utils python3 python3-cryptography
 %description    tools
 Tools for the TPM emulator from the swtpm package
 
+%package       tools-pkcs11
+Summary:       Tools for creating a local CA based on a pkcs11 device
+License:       BSD
+Requires:      swtpm-tools = %{version}-%{release}
+Requires:      tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
+Requires:      expect gnutls-utils trousers >= 0.3.9
+
+%description   tools-pkcs11
+Tools for creating a local CA based on a pkcs11 device
+
 %prep
 %autosetup -n %{name}-%{gitcommit}
 
@@ -97,8 +108,6 @@ make %{?_smp_mflags} check
 
 %make_install
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la,so}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/swtpm-create-tpmca.8*
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/swtpm-create-tpmca
 
 %post
 for pp in /usr/share/selinux/packages/swtpm.pp \
@@ -169,6 +178,10 @@ fi
 %{python3_sitelib}/swtpm_localca-*/*
 %attr( 750, tss, root) %{_localstatedir}/lib/swtpm-localca
 
+%files tools-pkcs11
+%{_mandir}/man8/swtpm-create-tpmca.8*
+%{_datadir}/swtpm/swtpm-create-tpmca
+
 %changelog
 * Fri Aug 28 2020 Stefan Berger <stefanb@linux.ibm.com> - 0.4.0-20200218git-------
 - v0.4.0 release

diff --git a/dist/swtpm.spec.in b/dist/swtpm.spec.in
index ded5bb5653fcf7d29cd3f2b152ea3ca879e34e77..e4597a7a6aa032e823c970015298d214f0a53654 100644 (file)
--- a/dist/swtpm.spec.in
+++ b/dist/swtpm.spec.in
@@ -44,6 +44,7 @@ BuildRequires:  libtasn1
 BuildRequires:  selinux-policy-devel
 BuildRequires:  gcc
 BuildRequires:  libseccomp-devel
+BuildRequires:  tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
 
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       libtpms >= 0.6.0
@@ -76,6 +77,16 @@ Requires:       trousers >= 0.3.9 bash gnutls-utils python3 python3-cryptography
 %description    tools
 Tools for the TPM emulator from the swtpm package
 
+%package       tools-pkcs11
+Summary:       Tools for creating a local CA based on a pkcs11 device
+License:       BSD
+Requires:      swtpm-tools = %{version}-%{release}
+Requires:      tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
+Requires:      expect gnutls-utils trousers >= 0.3.9
+
+%description   tools-pkcs11
+Tools for creating a local CA based on a pkcs11 device
+
 %prep
 %autosetup -n %{name}-%{gitcommit}
 
@@ -97,8 +108,6 @@ make %{?_smp_mflags} check
 
 %make_install
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la,so}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/swtpm-create-tpmca.8*
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/swtpm-create-tpmca
 
 %post
 for pp in /usr/share/selinux/packages/swtpm.pp \
@@ -169,6 +178,10 @@ fi
 %{python3_sitelib}/swtpm_localca-*/*
 %attr( 750, @TSS_USER@, root) %{_localstatedir}/lib/swtpm-localca
 
+%files tools-pkcs11
+%{_mandir}/man8/swtpm-create-tpmca.8*
+%{_datadir}/swtpm/swtpm-create-tpmca
+
 %changelog
 * Fri Aug 28 2020 Stefan Berger <stefanb@linux.ibm.com> - 0.4.0-20200218git-------
 - v0.4.0 release