17022: Fix packaging

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/tools/user-activity/MANIFEST.in b/tools/user-activity/MANIFEST.in
new file mode 100644 (file)
index 0000000..bd12263
--- /dev/null
+++ b/tools/user-activity/MANIFEST.in
@@ -0,0 +1,6 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+include agpl-3.0.txt
+include arvados_version.py
\ No newline at end of file

diff --git a/tools/user-activity/fpm-info.sh b/tools/user-activity/fpm-info.sh
new file mode 100644 (file)
index 0000000..0abc6a0
--- /dev/null
+++ b/tools/user-activity/fpm-info.sh
@@ -0,0 +1,9 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+case "$TARGET" in
+    debian* | ubuntu*)
+        fpm_depends+=(libcurl3-gnutls)
+        ;;
+esac

diff --git a/tools/user-activity/setup.py b/tools/user-activity/setup.py
index 6e00a5680d0de47f7ed67a1ce696e5ffde01ec07..41f8f66a079a0cd7025165d6381c9945a6f0c3bd 100755 (executable)
--- a/tools/user-activity/setup.py
+++ b/tools/user-activity/setup.py
@@ -31,7 +31,7 @@ setup(name='arvados-user-activity',
           ('share/doc/arvados_user_activity', ['agpl-3.0.txt']),
       ],
       install_requires=[
-          'arvados-python-client > 2.2.0.dev20201118185221',
+          'arvados-python-client >= 2.2.0.dev20201118185221',
       ],
       zip_safe=True,
 )