From d90fdccd1ef59460d1f27188882eb55bb9a676535d806450e795bbd1a704156b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 18 May 2018 19:12:02 +0000 Subject: [PATCH 1/3] Accepting request 610077 from home:michals - Split off library, spec-clean (bsc#1093612) OBS-URL: https://build.opensuse.org/request/show/610077 OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=17 --- ibmtss.changes | 5 +++++ ibmtss.spec | 40 +++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/ibmtss.changes b/ibmtss.changes index 0fee163..4df7cd4 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 17 13:12:22 UTC 2018 - msuchanek@suse.com + +- Split off library, spec-clean (bsc#1093612) + ------------------------------------------------------------------- Thu Jan 18 08:34:51 UTC 2018 - msuchanek@suse.com diff --git a/ibmtss.spec b/ibmtss.spec index f8b4a25..30e631a 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -18,6 +18,10 @@ # %define suite ibmtss +%define libversion 0 +%define libname libtss +%define libpkgname %{libname}%{libversion} +%define soname %{libname}.so.%{libversion} Name: ibmtss Version: 1045 @@ -25,15 +29,14 @@ Release: 0 Summary: IBM's TPM 2.0 TSS License: BSD-3-Clause Group: Productivity/Security -Url: https://sourceforge.net/projects/ibmtpm20tss +URL: https://sourceforge.net/projects/ibmtpm20tss Source: https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{version}.tar.gz -Patch: makefile.patch Source1: %{name} Source2: %{name}.1 +Patch: makefile.patch BuildRequires: ibmswtpm2 BuildRequires: libopenssl-devel Recommends: %{name}-base = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a user space TCG Software Stack (TSS) for TPM 2.0. It @@ -43,6 +46,13 @@ group's planned ESAPI, SAPI, and TCTI APIs. It comes with over 100 "TPM tools" that can be used for scripted apps, rapid prototyping, education, and debugging. +%package -n %{libpkgname} +Summary: Shared library for IBM's TPM 2.0 TSS +Group: Development/Libraries/C + +%description -n %{libpkgname} +Shared library for IBM's TPM 2.0 TSS tools + %package base Summary: IBM's TPM 2.0 TSS shared files Group: Productivity/Security @@ -54,19 +64,20 @@ Includes IBM's TPM 2.0 TSS certificates and policy files. %package devel Summary: IBM's TPM 2.0 TSS headers Group: Development/Libraries/C and C++ +Requires: %{libpkgname} = %{version} Requires: %{suite} = %{version} %description devel Includes IBM's TPM 2.0 TSS C header files %prep -%setup -c -q +%setup -q -c %patch -p 1 %build cd utils %{_libexecdir}/%{suite}/tpm_server & tpm_server="$!" -CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libexecdir}/%{suite}" %{?_smp_mflags} +CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libdir}" %{?_smp_mflags} testfailed=0 TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=. ./reg.sh || testfailed=$? kill "$tpm_server" || : @@ -74,7 +85,8 @@ kill "$tpm_server" || : %install cd utils -install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} libtss.so +install -m 755 -D -t %{buildroot}/%{_libdir} %{soname} +ln -s %{soname} %{buildroot}/%{_libdir}/%{libname}.so install -m 755 -D -t %{buildroot}/%{_libexecdir}/%{suite} \ activatecredential eventextend imaextend certify certifycreation changeeps changepps clear clearcontrol clockrateadjust clockset commit contextload contextsave create createloaded createprimary dictionaryattacklockreset dictionaryattackparameters duplicate eccparameters ecephemeral encryptdecrypt eventsequencecomplete evictcontrol flushcontext getcommandauditdigest getcapability getrandom getsessionauditdigest gettime hashsequencestart hash hierarchycontrol hierarchychangeauth hmac hmacstart import importpem load loadexternal makecredential nvcertify nvchangeauth nvdefinespace nvextend nvglobalwritelock nvincrement nvread nvreadlock nvreadpublic nvsetbits nvundefinespace nvundefinespacespecial nvwrite nvwritelock objectchangeauth pcrallocate pcrevent pcrextend pcrread pcrreset policyauthorize policyauthvalue policycommandcode policycphash policycountertimer policygetdigest policymaker policymakerpcr policyauthorizenv policynv policynvwritten policyor policypassword policypcr policyrestart policysigned policysecret policytemplate policyticket quote powerup readclock readpublic returncode rewrap rsadecrypt rsaencrypt sequenceupdate sequencecomplete setprimarypolicy shutdown sign startauthsession startup stirrandom unseal verifysignature signapp writeapp timepacket createek ntc2getconfig ntc2preconfig ntc2lockconfig mkdir -p %{buildroot}/%{_datadir}/%{suite} @@ -87,20 +99,22 @@ sed -i -e s,%UTILDIR%,%{_libexecdir}/%{suite},g -e s,%DATADIR%,%{_datadir}/%{sui %{buildroot}/%{_bindir}/%{suite} %{buildroot}/%{_mandir}/man1/%{suite}.1 %files -%defattr(-,root,root) -%doc ibmtss.doc LICENSE +%license LICENSE +%doc ibmtss.doc %{_libexecdir}/%{suite} %{_bindir}/%{suite} -%{_mandir}/man1/%{suite}.1* +%{_mandir}/man1/%{suite}.1%{?ext_man} + +%files -n %{libpkgname} +%{_libdir}/%{soname} %files base -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %{_datadir}/%{suite} %files devel -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %{_includedir}/%{suite} +%{_libdir}/%{libname}.so %changelog From 9b45f1d5dc793a98fb15480b6eab8868438374a6b109ba231f4add8367c1572c Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Mon, 21 May 2018 05:43:31 +0000 Subject: [PATCH 2/3] Accepting request 610550 from home:jengelh:branches:security - Fix RPM groups OBS-URL: https://build.opensuse.org/request/show/610550 OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=18 --- ibmtss.changes | 5 +++++ ibmtss.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ibmtss.changes b/ibmtss.changes index 4df7cd4..55420c6 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 18 21:55:16 UTC 2018 - jengelh@inai.de + +- Fix RPM groups + ------------------------------------------------------------------- Thu May 17 13:12:22 UTC 2018 - msuchanek@suse.com diff --git a/ibmtss.spec b/ibmtss.spec index 30e631a..ecf33f2 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -48,7 +48,7 @@ apps, rapid prototyping, education, and debugging. %package -n %{libpkgname} Summary: Shared library for IBM's TPM 2.0 TSS -Group: Development/Libraries/C +Group: System/Libraries %description -n %{libpkgname} Shared library for IBM's TPM 2.0 TSS tools From e7d34b8b00008a154559530d304a111f9fe5561e52cd789a96d2453a0e4d48bd Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Tue, 22 May 2018 12:43:20 +0000 Subject: [PATCH 3/3] Accepting request 611204 from home:michals - Add post/postun ldconfig call OBS-URL: https://build.opensuse.org/request/show/611204 OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=19 --- ibmtss.changes | 5 +++++ ibmtss.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ibmtss.changes b/ibmtss.changes index 55420c6..3f8144a 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 22 10:18:35 UTC 2018 - msuchanek@suse.com + +- Add post/postun ldconfig call + ------------------------------------------------------------------- Fri May 18 21:55:16 UTC 2018 - jengelh@inai.de diff --git a/ibmtss.spec b/ibmtss.spec index ecf33f2..c65c367 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -98,6 +98,9 @@ install -p -D -m 644 %{SOURCE1}.1 %{buildroot}/%{_mandir}/man1/%{suite}.1 sed -i -e s,%UTILDIR%,%{_libexecdir}/%{suite},g -e s,%DATADIR%,%{_datadir}/%{suite},g -e s,%DOCDIR%,%{_docdir}/%{name},g \ %{buildroot}/%{_bindir}/%{suite} %{buildroot}/%{_mandir}/man1/%{suite}.1 +%post -n %{libpkgname} -p /sbin/ldconfig +%postun -n %{libpkgname} -p /sbin/ldconfig + %files %license LICENSE %doc ibmtss.doc