Mercurial > hg > release > heapstats-2.0
changeset 175:f61490a04e04
Bug 3234: HeapStats agent cannot be upgraded with `rpm -U`
Reviewed-by: ykubota
https://github.com/HeapStats/heapstats/pull/49
| author | Yasumasa Suenaga <yasuenag@gmail.com> |
|---|---|
| date | Mon, 21 Nov 2016 22:57:12 +0900 |
| parents | f75dfa1ee0fd |
| children | acd9271d85a0 |
| files | ChangeLog release.sh specs/heapstats.spec |
| diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 15 13:13:23 2016 +0900 +++ b/ChangeLog Mon Nov 21 22:57:12 2016 +0900 @@ -1,3 +1,7 @@ +2016-11-21 Yasumasa Suenaga <yasuenag@gmail.com> + + * Bug 3234: HeapStats agent cannot be upgraded with `rpm -U` + 2016-11-15 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> * Bump to 2.0.3
--- a/release.sh Tue Nov 15 13:13:23 2016 +0900 +++ b/release.sh Mon Nov 21 22:57:12 2016 +0900 @@ -68,8 +68,6 @@ # heapstats.spec SPECFILE=specs/heapstats.spec sed -i -e "/Version:/s#[0-9]\.[0-9]\.[0-9]#${VERSION}#g" ${SPECFILE} -## heapstats-cli distribution -sed -i -e "/heapstats-cli-${CURRENT_VERSION}/s#${CURRENT_VERSION}#${VERSION}#g" ${SPECFILE} ## Copyright YEAR=$(LANG=C date "+%Y") TO_YEAR=`sed -n 's#^Copyright\s(C)\s2011-\(.\+\)\sNippon.\+#\1#p' ${SPECFILE}`
--- a/specs/heapstats.spec Tue Nov 15 13:13:23 2016 +0900 +++ b/specs/heapstats.spec Mon Nov 21 22:57:12 2016 +0900 @@ -24,7 +24,6 @@ BuildRequires: binutils-devel BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool BuildRequires: maven %package cli @@ -78,7 +77,7 @@ # We do not privide FX analyzer. # So we install CLI analyzer manually. mkdir -p ${RPM_BUILD_ROOT}/%{_libexecdir}/heapstats -cp -fR ./analyzer/cli/target/heapstats-cli-2.0.3-bin/heapstats-cli-2.0.3/* \ +cp -fR ./analyzer/cli/target/heapstats-cli-%{version}-bin/heapstats-cli-%{version}/* \ ${RPM_BUILD_ROOT}%{_libexecdir}/heapstats/ cp -f ./analyzer/cli/heapstats-cli ${RPM_BUILD_ROOT}%{_bindir} chmod a+x ${RPM_BUILD_ROOT}%{_bindir}/heapstats-cli @@ -86,9 +85,14 @@ %post /sbin/ldconfig +%preun +if [ $1 -eq 0 ]; then # uninstall + # Remove symlink which is generated by ldconfig + rm -f %{_libdir}/heapstats/libheapstats.so +fi + %postun /sbin/ldconfig -rm -fR %{_libdir}/heapstats %clean rm -rf $RPM_BUILD_ROOT