Accepting request 787584 from home:michals

- Fix dependencies for epoch, remove useless define.

OBS-URL: https://build.opensuse.org/request/show/787584
OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=32
This commit is contained in:
Michal Suchanek 2020-03-23 20:24:31 +00:00 committed by Git OBS Bridge
parent e339afb84c
commit 50dd71e5fe
2 changed files with 13 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 23 20:10:11 UTC 2020 - Michal Suchanek <msuchanek@suse.com>
- Fix dependencies for epoch, remove useless define.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 31 11:53:40 UTC 2020 - Michal Suchanek <msuchanek@suse.com> Fri Jan 31 11:53:40 UTC 2020 - Michal Suchanek <msuchanek@suse.com>

View File

@ -17,7 +17,6 @@
# #
%define suite ibmtss
%define libversion 1 %define libversion 1
%define libversion_full 1.3.0 %define libversion_full 1.3.0
%define libname libibmtss %define libname libibmtss
@ -50,7 +49,7 @@ apps, rapid prototyping, education, and debugging.
%package -n %{libpkgname} %package -n %{libpkgname}
Summary: Shared library for IBM's TPM 2.0 TSS Summary: Shared library for IBM's TPM 2.0 TSS
Group: System/Libraries Group: System/Libraries
Recommends: %{name}-base = %{version} Recommends: %{name}-base = %{epoch}:%{version}
%description -n %{libpkgname} %description -n %{libpkgname}
Shared library for IBM's TPM 2.0 TSS tools Shared library for IBM's TPM 2.0 TSS tools
@ -67,8 +66,8 @@ Includes IBM's TPM 2.0 TSS certificates and policy files.
%package devel %package devel
Summary: IBM's TPM 2.0 TSS headers Summary: IBM's TPM 2.0 TSS headers
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{libpkgname} = %{version} Requires: %{libpkgname} = %{epoch}:%{version}
Requires: %{suite} = %{version} Requires: %{name} = %{epoch}:%{version}
%description devel %description devel
Includes IBM's TPM 2.0 TSS C header files Includes IBM's TPM 2.0 TSS C header files
@ -80,7 +79,7 @@ Includes IBM's TPM 2.0 TSS C header files
autoreconf -i autoreconf -i
%configure --enable-hwtpm --enable-debug --disable-static %configure --enable-hwtpm --enable-debug --disable-static
cd utils cd utils
%{_libexecdir}/%{suite}/tpm_server & tpm_server="$!" %{_libexecdir}/%{name}/tpm_server & tpm_server="$!"
CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libdir}" %{?_smp_mflags} CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libdir}" %{?_smp_mflags}
testfailed=0 testfailed=0
TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=.libs ./reg.sh || testfailed=$? TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=.libs ./reg.sh || testfailed=$?
@ -92,8 +91,8 @@ install -m 644 -D -t %{buildroot}%{_prefix}/lib/udev/rules.d/ %{SOURCE1}
cd utils cd utils
%make_install %make_install
mkdir -p %{buildroot}/%{_datadir}/%{suite} mkdir -p %{buildroot}/%{_datadir}/%{name}
cp -a policies certificates %{buildroot}/%{_datadir}/%{suite} cp -a policies certificates %{buildroot}/%{_datadir}/%{name}
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -name .cvsignore | xargs rm -v find %{buildroot} -name .cvsignore | xargs rm -v
@ -115,12 +114,12 @@ find %{buildroot} -name .cvsignore | xargs rm -v
%files base %files base
%license LICENSE %license LICENSE
%{_datadir}/%{suite} %{_datadir}/%{name}
%{_prefix}/lib/udev/rules.d/* %{_prefix}/lib/udev/rules.d/*
%files devel %files devel
%license LICENSE %license LICENSE
%{_includedir}/%{suite} %{_includedir}/%{name}
%{_libdir}/%{libname}*.so %{_libdir}/%{libname}*.so
%changelog %changelog