build: fix bashrc makefile macro, release as pcp-5.2.5

performancecopilot · Feb 8, 2021 · 27fc9a7 · 27fc9a7
1 parent d97cfef
commit 27fc9a7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-pcp-5.2.4 (8 February 2021)
+pcp-5.2.5 (8 February 2021)
     - Client tools and utilities:
 	pcp-dstat: correct the sample count logic, was off-by-one
 	pcp-dstat: fix csv output with timestamps (no special chars)

diff --git a/VERSION.pcp b/VERSION.pcp
@@ -3,5 +3,5 @@
 #
 PACKAGE_MAJOR=5
 PACKAGE_MINOR=2
-PACKAGE_REVISION=4
+PACKAGE_REVISION=5
 PACKAGE_BUILD=1
diff --git a/build/rpm/redhat.spec b/build/rpm/redhat.spec
@@ -1,5 +1,5 @@
 Name:    pcp
-Version: 5.2.4
+Version: 5.2.5
 Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
@@ -2328,7 +2328,7 @@ for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmproxy}; do
 done
 
 # list of PMDAs in the base pcp package
-for pmda in jbd2 kvm linux mmv pipe pmcd proc root xfs; do
+for pmda in jbd2 kvm linux mmv pipe pmcd proc root xfs zfs; do
     for alt in %{_pmdasdir} %{_pmdasexecdir} %{_confdir}; do
         [ -d $RPM_BUILD_ROOT/$alt/$pmda ] && echo $alt/$pmda >>base_pmdas.list
     done
@@ -3490,7 +3490,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %endif
 
 %changelog
-* Wed Feb 10 2021 Nathan Scott <nathans@redhat.com> - 5.2.4-1
+* Mon Feb 08 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-1
 - Update to latest PCP sources.
 - Fix off-by-one issue in pcp-dstat reporting (BZ 1922768)
 - Add dstat(1) symlink to pcp-dstat(1) man page (BZ 1922771)

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-pcp (5.2.4-1) unstable; urgency=low
+pcp (5.2.5-1) unstable; urgency=low
 
   * New release (full details in CHANGELOG).
   * Add systemd package dependency (closes: #962994)

diff --git a/src/bashrc/GNUmakefile b/src/bashrc/GNUmakefile
@@ -16,6 +16,7 @@ TOPDIR = ../..
 include $(TOPDIR)/src/include/builddefs
 
 BASHRC = pcp_completion.sh
+BASHDIR = $(PCP_BASHSHARE_DIR)/completions
 COMMANDS = pmdumplog pmlogcheck pmlogextract pmlogsummary \
 	   pminfo pmprobe pmstat pmstore pmevent pmval
 
@@ -25,10 +26,10 @@ include $(BUILDRULES)
 
 install:	default
 	$(INSTALL) -d $(PCP_BASHSHARE_DIR)
-	$(INSTALL) -d $(PCP_BASHSHARE_DIR)/completions
-	$(INSTALL) -m 644 $(BASHRC) $(PCP_BASHSHARE_DIR)/completions/pcp
+	$(INSTALL) -d $(BASHDIR)
+	$(INSTALL) -m 644 $(BASHRC) $(BASHDIR)/pcp
 	for c in `echo $(COMMANDS)`; do \
-	    $(INSTALL) -S $(PCP_BASHSHARE_DIR)/completions/pcp $(BASHDIR)/completions/$$c; \
+	    $(INSTALL) -S $(BASHDIR)/pcp $(BASHDIR)/$$c; \
 	done
 
 default_pcp:	default