13200:test to remove prefix on python

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/build/go-python-package-scripts/postinst b/build/go-python-package-scripts/postinst
index 6d303f2e3e8cdd00b0d22cd8290d1655643472f2..cc63f351f61b8b6cce3da4016015fc4a5ef97bf2 100755 (executable)
--- a/build/go-python-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -9,7 +9,6 @@ if [ "%{name}" != "%\{name\}" ]; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
-    prefix="${RPM_INSTALL_PREFIX}"
 else
     # Debian
     script="$(basename "${0}")"

diff --git a/build/go-python-package-scripts/prerm b/build/go-python-package-scripts/prerm
index d840ee1bd16cbf272a7807a2b0b36310cbb466ba..49bd7fc881c0832d64a65c6c39fe57174495c284 100755 (executable)
--- a/build/go-python-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -9,7 +9,6 @@ if [ "%{name}" != "%\{name\}" ]; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
-    prefix="${RPM_INSTALL_PREFIX}"
 else
     # Debian
     script="$(basename "${0}")"

diff --git a/build/run-library.sh b/build/run-library.sh
index 2e441e4f48cb0ffeae887af244db11fff5aeb5f4..238d6d62ccbef275ecec50604583afd026dd5b17 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -50,7 +50,7 @@ version_from_git() {
         return
     fi
 
-    local git_ts git_hash
+    local git_ts git_hash prefix
     if [[ -n "$1" ]] ; then
         prefix="$1"
     else
@@ -391,6 +391,8 @@ fpm_build () {
           python=python2.7
           set -- "$@" --python-bin python2.7 \
               --python-easyinstall "$EASY_INSTALL2" \
+              --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \
+              --prefix "$PYTHON2_PREFIX" \
               --python-install-lib "$PYTHON2_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON2_INSTALL_LIB#/}/tests" \
@@ -405,6 +407,8 @@ fpm_build () {
           python=python3
           set -- "$@" --python-bin python3 \
               --python-easyinstall "$EASY_INSTALL3" \
+              --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \
+              --prefix "$PYTHON3_PREFIX" \
               --python-install-lib "$PYTHON3_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON3_INSTALL_LIB#/}/tests" \