diff --git a/Makefile b/Makefile index 2edd32e..2ffd4b5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := glances -URL = https://github.com/nicolargo/glances/archive/v3.1.3/glances-3.1.3.tar.gz +URL = https://github.com/nicolargo/glances/archive/v3.2.3/glances-3.2.3.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/buildreq_add b/buildreq_add index 9f024a6..db7f106 100644 --- a/buildreq_add +++ b/buildreq_add @@ -1,2 +1,4 @@ +# This file contains additional build requirements that did not get +# picked up automatically. One name per line, no whitespace. psutil python-future diff --git a/fix-unittest.patch b/fix-unittest.patch deleted file mode 100644 index 5e087ce..0000000 --- a/fix-unittest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From abf64ffde31113f5f46ef286703ff061fc57395f Mon Sep 17 00:00:00 2001 -From: nicolargo -Date: Sat, 12 Oct 2019 11:45:36 +0200 -Subject: [PATCH] Correct unitest - ---- - glances/plugins/glances_plugin.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py -index 6a1c8606..23a76f80 100644 ---- a/glances/plugins/glances_plugin.py -+++ b/glances/plugins/glances_plugin.py -@@ -86,10 +86,11 @@ def __init__(self, - self.stats_history = self.init_stats_history() - - # Init the limits (configuration keys) dictionnary -- logger.debug('Load section {} in {}'.format(self.plugin_name, -- config.config_file_paths())) - self._limits = dict() -- self.load_limits(config=config) -+ if config is not None: -+ logger.debug('Load section {} in {}'.format(self.plugin_name, -+ config.config_file_paths())) -+ self.load_limits(config=config) - - # Init the actions - self.actions = GlancesActions(args=args) diff --git a/glances.spec b/glances.spec index 08cc889..4836768 100644 --- a/glances.spec +++ b/glances.spec @@ -3,10 +3,10 @@ # Generated by: autospec.py # Name : glances -Version : 3.1.3 -Release : 41 -URL : https://github.com/nicolargo/glances/archive/v3.1.3/glances-3.1.3.tar.gz -Source0 : https://github.com/nicolargo/glances/archive/v3.1.3/glances-3.1.3.tar.gz +Version : 3.2.3 +Release : 42 +URL : https://github.com/nicolargo/glances/archive/v3.2.3/glances-3.2.3.tar.gz +Source0 : https://github.com/nicolargo/glances/archive/v3.2.3/glances-3.2.3.tar.gz Summary : A cross-platform curses-based monitoring tool Group : Development/Tools License : LGPL-3.0 @@ -15,9 +15,11 @@ Requires: glances-license = %{version}-%{release} Requires: glances-man = %{version}-%{release} Requires: glances-python = %{version}-%{release} Requires: glances-python3 = %{version}-%{release} +Requires: defusedxml Requires: psutil Requires: python-future BuildRequires : buildreq-distutils3 +BuildRequires : defusedxml BuildRequires : pluggy BuildRequires : psutil BuildRequires : py-python @@ -25,7 +27,6 @@ BuildRequires : pytest BuildRequires : python-future BuildRequires : tox BuildRequires : virtualenv -Patch1: fix-unittest.patch %description =============================== @@ -80,6 +81,7 @@ Summary: python3 components for the glances package. Group: Default Requires: python3-core Provides: pypi(glances) +Requires: pypi(defusedxml) Requires: pypi(future) Requires: pypi(psutil) @@ -88,16 +90,15 @@ python3 components for the glances package. %prep -%setup -q -n glances-3.1.3 -cd %{_builddir}/glances-3.1.3 -%patch1 -p1 +%setup -q -n glances-3.2.3 +cd %{_builddir}/glances-3.2.3 %build export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C.UTF-8 -export SOURCE_DATE_EPOCH=1608007446 +export SOURCE_DATE_EPOCH=1629154861 export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fno-lto " export FCFLAGS="$FFLAGS -fno-lto " @@ -115,7 +116,7 @@ PYTHONPATH=%{buildroot}$(python -c "import sys; print(sys.path[-1])") python set export MAKEFLAGS=%{?_smp_mflags} rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/glances -cp %{_builddir}/glances-3.1.3/COPYING %{buildroot}/usr/share/package-licenses/glances/49d4c0ce1a16601f1e265d446b6c5ea6b512f27c +cp %{_builddir}/glances-3.2.3/COPYING %{buildroot}/usr/share/package-licenses/glances/49d4c0ce1a16601f1e265d446b6c5ea6b512f27c python3 -tt setup.py build install --root=%{buildroot} echo ----[ mark ]---- cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || : diff --git a/options.conf b/options.conf index fedb184..3296b2b 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = glances -url = https://github.com/nicolargo/glances/archive/v3.1.3/glances-3.1.3.tar.gz +url = https://github.com/nicolargo/glances/archive/v3.2.3/glances-3.2.3.tar.gz archives = giturl = https://github.com/nicolargo/glances.git domain = diff --git a/release b/release index 87523dd..d81cc07 100644 --- a/release +++ b/release @@ -1 +1 @@ -41 +42 diff --git a/series b/series deleted file mode 100644 index 829beb7..0000000 --- a/series +++ /dev/null @@ -1 +0,0 @@ -fix-unittest.patch diff --git a/testresults b/testresults index 6b0f809..7c81bc2 100644 --- a/testresults +++ b/testresults @@ -1,5 +1,5 @@ -Total : 25 -Pass : 24 -Fail : 1 +Total : 26 +Pass : 26 +Fail : 0 Skip : 0 XFail : 0 diff --git a/upstream b/upstream index 1572c9a..81a0989 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -cb4c04db2155302f2ee3e1153dfe4b8f7f918f19/glances-3.1.3.tar.gz +932f66665009ea8cc6ec66da77b89129a529a0c8/glances-3.2.3.tar.gz diff --git a/versions b/versions index ff365e0..b347b11 100644 --- a/versions +++ b/versions @@ -1 +1 @@ -3.1.3 +3.2.3