[pcp-gui] Handle differences between different base PCP versions

[nathans]

commit 59112a87978fbae4e7f1e5b9f1a671998f89fed0
Author: Nathan Scott <nathans at redhat.com>
Date:   Sat Apr 20 10:37:11 2013 +1000

    Handle differences between different base PCP versions

 pcp-gui.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/pcp-gui.spec b/pcp-gui.spec
index 8c84f04..bad7d2e 100644
--- a/pcp-gui.spec
+++ b/pcp-gui.spec
@@ -1,7 +1,7 @@
 Summary: Visualization tools for the Performance Co-Pilot toolkit
 Name: pcp-gui
 Version: 1.5.8
-%define buildversion 1
+%define buildversion 2
 
 Release: %{buildversion}%{?dist}
 License: GPLv2+ and LGPLv2+ and LGPLv2+ with exceptions
@@ -75,7 +75,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 export DIST_ROOT=$RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+export PCP_PMSNAPCONTROL_PATH=/etc/pcp/pmsnap/control
+make install DESTDIR=$RPM_BUILD_ROOT PCP_PMSNAPCONTROL_PATH=$PCP_PMSNAPCONTROL_PATH
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/pcp-gui
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
 
@@ -104,9 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_localstatedir}/lib/pcp-gui/testsuite
 
 %changelog
-* Sat Apr 20 2013 Nathan Scott <nathans at redhat.com> - 1.5.8-1
+* Sat Apr 20 2013 Nathan Scott <nathans at redhat.com> - 1.5.8-2
 - Update to latest PCP GUI sources.
 - Build fix when building against older PCP headers.
+- Force PCP_PMSNAPCONTROL_PATH to the preferred location.
 
 * Fri Apr 19 2013 Nathan Scott <nathans at redhat.com> - 1.5.7-1
 - Update to latest PCP GUI sources.