From c4a2eb4a61fe381e842e45b8a3a89a225b42ff28 Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: May 22 2019 15:12:21 +0000
Subject: Issue 50037 - lib389 fails to install in venv under non-root user


Bug description:
Some files were installed using absolute path, preventing installation
under non-root user.

Fix description:
Change paths to be relative to the current prefix.
Update .gitignore to exlcude venv and build products.
Update tox.ini to the current supported Python versions.

Fixes https://pagure.io/389-ds-base/issue/50037

Reviewed by: mhonek, firstyear, spichugi (Thanks!)

---

diff --git a/.gitignore b/.gitignore
index 141faab..e6b941a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,3 +225,8 @@ html/
 src/lib389/dist/
 src/lib389/man/
 src/libsds/target/
+dist
+venv
+.idea
+src/cockpit/389-console/cockpit_dist/
+src/cockpit/389-console/node_modules/
diff --git a/src/lib389/setup.py b/src/lib389/setup.py
index 8e8eed8..513d2dc 100644
--- a/src/lib389/setup.py
+++ b/src/lib389/setup.py
@@ -46,9 +46,9 @@ setup(
         'Intended Audience :: Developers',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing'],
@@ -58,14 +58,14 @@ setup(
 
     # find lib389/clitools -name ds\* -exec echo \''{}'\', \;
     data_files=[
-        ('/usr/sbin/', [
+        ('sbin/', [
             'cli/dsctl',
             'cli/dsconf',
             'cli/dscreate',
             'cli/dsidm',
             'cli/dscontainer',
             ]),
-        ('/usr/share/man/man8', [
+        ('share/man/man8', [
             'man/dsctl.8',
             'man/dsconf.8',
             'man/dscreate.8',
diff --git a/src/lib389/tox.ini b/src/lib389/tox.ini
index c1da3c8..d90ee98 100644
--- a/src/lib389/tox.ini
+++ b/src/lib389/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py35, py36, py37
 
 [testenv]
 deps = -rrequirements.txt