!6 tpm2-abrmd: upgrade to 2.2.0

Merge pull request !6 from guoxiaoqi/next

tpm2-abrmd.spec

@@ -1,6 +1,6 @@
 Name:            tpm2-abrmd
-Version:         2.0.1
-Release:         4
+Version:         2.2.0
+Release:         1
 Summary:         A system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG
 License:         BSD
 URL:             https://github.com/tpm2-software/tpm2-abrmd
@@ -8,6 +8,7 @@ Source0:         https://github.com/tpm2-software/tpm2-abrmd/releases/download/%
 
 BuildRequires:   systemd pkgconfig(cmocka) pkgconfig(dbus-1) pkgconfig(gio-unix-2.0) pkgconfig(tss2-mu) pkgconfig(tss2-sys)
 BuildRequires:   tpm2-tss-devel libtool autoconf-archive libgcrypt libgcrypt-devel
+BuildRequires:   chrpath
 
 %description
 This is a system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG. 
@@ -25,7 +26,7 @@ This package contains development library files, headers and config files of tpm
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 export GDBUS_CODEGEN="/usr/bin/gdbus-codegen"
@@ -38,6 +39,12 @@ export GDBUS_CODEGEN="/usr/bin/gdbus-codegen"
 %make_install
 %delete_la_and_a
 
+#Remove Rpath
+chrpath -d $RPM_BUILD_ROOT%{_libdir}/libtss2-tcti-tabrmd.so.0.0.0
+chrpath -d $RPM_BUILD_ROOT%{_sbindir}/tpm2-abrmd
+mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo "/usr/lib64/" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %check
 make test
 
@@ -70,6 +77,7 @@ exit 0
 %{_presetdir}/tpm2-abrmd.preset
 %{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf
+%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %defattr(-,root,root)
@@ -83,6 +91,24 @@ exit 0
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Fri Apr 24 2020 wanghongzhe<wanghongzhe@huawei.com> - 2.2.0-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC: update to 2.2.0
+
+* Wed Mar 25 2020 wanghongzhe<wanghongzhe@huawei.com> - 2.0.1-4.h2
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC: fix communication faild to tpm because updated glib2
+
+* Sat Mar 7 2020 wanghongzhe<wanghongzhe@huawei.com> - 2.0.1-4.h1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC: remove rpath and runpath of exec files and libraries
+
 * Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.0.1-4
 - Add buildrequires of libgcrypt-devel