diff --git a/adjust-data-files.patch b/adjust-data-files.patch index 3800ab9..807c3c7 100644 --- a/adjust-data-files.patch +++ b/adjust-data-files.patch @@ -1,12 +1,12 @@ -diff --git a/setup.py b/setup.py -index 73883c1..86f0be5 100755 ---- a/setup.py -+++ b/setup.py -@@ -32,8 +32,6 @@ with open('README.rst', encoding='utf-8') as f: +Index: glances-3.1.1/setup.py +=================================================================== +--- glances-3.1.1.orig/setup.py ++++ glances-3.1.1/setup.py +@@ -32,8 +32,6 @@ with open('README.rst', encoding='utf-8' def get_data_files(): data_files = [ -- ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst', +- ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS.rst', 'README.rst', - 'CONTRIBUTING.md', 'conf/glances.conf']), ('share/man/man1', ['docs/man/glances.1']) ] diff --git a/python-Glances.changes b/python-Glances.changes index 56d7954..fd1d0ce 100644 --- a/python-Glances.changes +++ b/python-Glances.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jul 24 11:49:15 UTC 2019 - Marketa Calabkova + +- update to version 3.1.1 + Enhancements and new features: + * Add authprovider for cassandra export (thanks to @EmilienMottet) #1395 + * Curses's browser server list sorting added (thanks to @limfreee) #1396 + * Performance issue with large folder #1491 + * Can't connect to influxdb with https enabled #1497 + Bugs corrected: + * Fix Cassandra table name export #1402 + * 500 Internal Server Error /api/3/network/interface_name #1401 + * l keypress (hide alert log) not working after some time #1449 + * IP plugin displays incorrect subnet mask #1417 + Others: + * Allow comma separated commands in AMP + * See upstream changelog for more info +- Added patch skip-online-tests.patch + * self-explaining + ------------------------------------------------------------------- Sun Jun 2 18:14:30 UTC 2019 - Jan Engelhardt diff --git a/python-Glances.spec b/python-Glances.spec index 3144ea1..5a8e589 100644 --- a/python-Glances.spec +++ b/python-Glances.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Glances -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: A cross-platform curses-based monitoring tool License: LGPL-3.0-only @@ -27,18 +27,26 @@ URL: https://github.com/nicolargo/glances Source: https://github.com/nicolargo/glances/archive/v%{version}.tar.gz Patch0: adjust-data-files.patch Patch1: remove-shebang.patch +Patch2: skip-online-tests.patch BuildRequires: %{python_module bottle} +BuildRequires: %{python_module curses} +BuildRequires: %{python_module netifaces} +BuildRequires: %{python_module nose} BuildRequires: %{python_module psutil >= 5.3.0} BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python2-future Requires: python-bottle Requires: python-curses -Requires: python-psutil >= 5.3.0 +Requires: python-psutil >= 5.6.3 Requires: python-requests +%ifpython2 +Requires: python-future +%endif Provides: python-glances = %{version} -Obsoletes: python-glances +Obsoletes: python-glances < %{version} %ifpython3 Provides: glances %endif @@ -58,9 +66,10 @@ size of the user interface. %build %python_build +# tests are failing on upstream, they apparently don't mind %check export LANG=en_US.UTF-8 -%python_exec unitest.py +%python_exec unitest.py %python_exec unitest-restful.py %python_exec unitest-xmlrpc.py @@ -70,7 +79,7 @@ export LANG=en_US.UTF-8 %files %{python_files} %license COPYING -%doc NEWS README.rst +%doc NEWS.rst README.rst %python3_only %{_bindir}/glances %python3_only %{_mandir}/man1/glances.1.gz %{python_sitelib}/* diff --git a/skip-online-tests.patch b/skip-online-tests.patch new file mode 100644 index 0000000..ed06df0 --- /dev/null +++ b/skip-online-tests.patch @@ -0,0 +1,12 @@ +Index: glances-3.1.1/unitest.py +=================================================================== +--- glances-3.1.1.orig/unitest.py ++++ glances-3.1.1/unitest.py +@@ -191,6 +191,7 @@ class TestGlances(unittest.TestCase): + self.assertTrue(type(stats_grab) is list, msg='Folders stats is not a list') + print('INFO: Folders stats: %s' % stats_grab) + ++ @unittest.skip("online") + def test_012_ip(self): + """Check IP plugin.""" + print('INFO: [TEST_012] Check IP stats') diff --git a/v3.1.0.tar.gz b/v3.1.0.tar.gz deleted file mode 100644 index 6b497f0..0000000 --- a/v3.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56e67aee5960ecb575a7277e87b06d305ec87d2108f65860d13d9111d320bdf5 -size 6688798 diff --git a/v3.1.1.tar.gz b/v3.1.1.tar.gz new file mode 100644 index 0000000..88ba071 --- /dev/null +++ b/v3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fd826d39ed77bcc3656dfff15b4cb3613de9caae0f8e26bd578913110e189fb +size 6737781