diff --git a/ibmtss.changes b/ibmtss.changes index 0fee163..3f8144a 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 + +- Fix RPM groups + +------------------------------------------------------------------- +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..c65c367 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: System/Libraries + +%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} @@ -86,21 +98,26 @@ 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 -%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