- fix python install

- rel 8

diff --git a/pcp.spec b/pcp.spec
index 24fd393bfa6e60a52d9f6fbb792de71b5b51319a..1c984831ca73d94e1e46481f217aa29870808aa7 100644 (file)
--- a/pcp.spec
+++ b/pcp.spec
@@ -13,7 +13,7 @@ Summary:      Performance Co-Pilot - system level performance monitoring and manageme
 Summary(pl.UTF-8):     Performance Co-Pilot - monitorowanie i zarządzanie wydajnością na poziomie systemu
 Name:          pcp
 Version:       3.10.0
-Release:       7
+Release:       8
 License:       LGPL v2.1 (libraries), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       ftp://oss.sgi.com/projects/pcp/download/%{name}-%{version}.src.tar.gz
@@ -23,6 +23,7 @@ Patch1:               %{name}-opt.patch
 Patch2:                %{name}-nspr.patch
 Patch3:                %{name}-saslconfdir.patch
 Patch4:                %{name}-rpm.patch
+Patch5:                python-install.patch
 URL:           http://oss.sgi.com/projects/pcp/
 BuildRequires: autoconf >= 2.60
 BuildRequires: avahi-devel
@@ -219,11 +220,13 @@ Sondy systemtap/dtrace dla PCP.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__autoconf}
 %configure \
        %{!?with_qt:--without-qt} \
+       --with-python_prefix=%{_prefix} \
        --with-rcdir=/etc/rc.d/init.d
 # ensure not *zipping man pages on install
 %{__sed} -i -e '/^HAVE_.*ED_MANPAGES/s,true,false,' src/include/builddefs

diff --git a/python-install.patch b/python-install.patch
new file mode 100644 (file)
index 0000000..ebaee31
--- /dev/null
+++ b/python-install.patch
@@ -0,0 +1,16 @@
+--- pcp-3.10.0/src/include/builddefs.in~       2014-10-28 01:29:54.000000000 +0100
++++ pcp-3.10.0/src/include/builddefs.in        2015-12-31 13:27:42.495614262 +0100
+@@ -555,13 +555,10 @@
+ SETUP_PY_BUILD_OPTIONS += --library-dirs=$(TOPDIR)/src/libpcp/src:$(TOPDIR)/src/libpcp_pmda/src:$(TOPDIR)/src/libpcp_gui/src:$(TOPDIR)/src/libpcp_import/src:$(TOPDIR)/src/libpcp_mmv/src
+ SETUP_PY_INSTALL_OPTIONS = --skip-build
+ SETUP_PY_INSTALL_OPTIONS += --root=$${DIST_ROOT-/}
+-ifeq "$(PYTHON_PREFIX)" "/usr"
+ ifeq "$(PACKAGE_DISTRIBUTION)" "debian"
+ SETUP_PY_INSTALL_OPTIONS += --install-layout=deb
+ endif
+-else
+ SETUP_PY_INSTALL_OPTIONS += --prefix=$(PYTHON_PREFIX)
+-endif
+ # RPM byte-compiles and installs results in our DIST_ROOT, cater for this:
+ ifeq "$(shell [ '$(TARGET_OS)' = linux -a '$(PACKAGE_DISTRIBUTION)' != gentoo \
+             ] && echo 1)" "1"