updated packaging to v 3.1.7

Change-Id: Idf483aec7f55e429c3f68ef26646d77ad02de56f
Signed-off-by: Nicolas Zingilé <nicolas.zingile@open.eurogiciel.org>

diff --git a/packaging/testkit-lite.spec b/packaging/testkit-lite.spec
index 1b75f59..b1e103c 100644 (file)
--- a/packaging/testkit-lite.spec
+++ b/packaging/testkit-lite.spec
@@ -1,6 +1,6 @@
 Summary:        Test runner with a command-line interface
 Name:           testkit-lite
-Version:        3.1.0
+Version:        3.1.7
 Release:        0
 URL:            https://github.com/testkit/testkit-lite
 License:        GPL-2.0
@@ -49,6 +49,7 @@ sed -i '/^#!/d' ./testkitlite/util/process.py
 sed -i '/^#!/d' ./testkitlite/util/result.py
 sed -i '/^#!/d' ./testkitlite/util/session.py
 sed -i '/^#!/d' ./testkitlite/util/str2.py
+sed -i '/^#!/d' ./testkitmerge/merger.py
 
 
 %build
@@ -71,10 +72,13 @@ popd
 %config %{_sysconfdir}/dbus-1/system.d/com.intel.testkit.conf
 %{_bindir}/testkit-lite
 %{_bindir}/testkit-lite-dbus
+%{_bindir}/testkit-merge
+/opt/testkit/lite/mh.html
 /opt/testkit/lite/testkit-lite_user_guide.pdf
 /opt/testkit/lite/testkit-lite_tutorial.pdf
 /opt/testkit/lite/test_definition_schema.pdf
 %{python_sitelib}/testkitlite/*
+%{python_sitelib}/testkitmerge/*
 %{python_sitelib}/testkit_lite-%{version}-py%{py_ver}.egg-info/*
 %{_datadir}/%{name}
 /opt/testkit/lite/VERSION

diff --git a/setup.py b/setup.py
index ac09b18..490c044 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ setup(
                   ('/opt/testkit/lite/commodule/', ['CONFIG']),
                   ('/opt/testkit/lite', ['resource/mh.html']),
                   ('/etc/dbus-1/system.d/', ['dbus/com.intel.testkit.conf'])],
-    scripts = ('testkit-lite', 'dbus/testkit-lite-dbus'),
+    scripts = ('testkit-lite', 'dbus/testkit-lite-dbus', 'testkit-merge'),
     packages = find_packages(),
     cmdclass = {'install_data': post_install_cmd},
 )