[rpms/glances] epel10: upgrade to 3.1.4.1 and add glances.conf

[rpms/glances] epel10: upgrade to 3.1.4.1 and add glances.conf

[Edouard Bourguignon]

A new commit has been pushed.

Repo   : rpms/glances
Branch : epel10
Commit : 99876ed75e72c6d4575873550fa3b8ff81bf34c2
Author : Edouard Bourguignon <madko@linuxed.net>
Date   : 2020-05-27T18:25:41+02:00
Stats  : +10/-12 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/glances/c/99876ed75e72c6d4575873550fa3b8ff81bf34c2?branch=epel10

Log:
upgrade to 3.1.4.1 and add glances.conf

---
diff --git a/glances.spec b/glances.spec
index cfeba21..f3db55e 100644
--- a/glances.spec
+++ b/glances.spec
@@ -2,7 +2,7 @@
 
 %{?python_enable_dependency_generator}
 Name:		glances	
-Version:	3.1.4
+Version:	3.1.4.1
 Release:	1%{?dist}
 Summary:	CLI curses based monitoring tool
 
@@ -10,6 +10,7 @@ Group:		Applications/System
 License:	GPLv3
 URL:		https://github.com/nicolargo/glances
 Source0:	https://github.com/nicolargo/glances/archive/v%{version}.tar.gz
+Source1:	glances.conf
 BuildArch:	noarch
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
@@ -33,6 +34,7 @@ It is developed in Python.
 
 %install
 %py3_install
+%{__install} -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/glances/glances.conf
 
 %check
 %{__python3} setup.py test
@@ -40,6 +42,7 @@ It is developed in Python.
 %files
 %doc AUTHORS COPYING README.rst
 %license COPYING
+%{_sysconfdir}/glances/glances.conf
 %{_bindir}/glances
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/Glances-%{version}-py%{python3_version}.egg-info/
@@ -48,20 +51,15 @@ It is developed in Python.
 
 
 %changelog
+* Wed May 27 2020 Edouard Bourguignon <madko@linuxed.net> - 3.1.4.1-1
+- Upgrade to 3.1.4.1
+- Adding glances.conf to prevent update checks
+
 * Sat Mar 14 2020 Edouard Bourguignon <madko@linuxed.net> - 3.1.4-1
 - Upgrade to 3.1.4
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-3
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Fri Aug 16 2019 Edouard Bourguignon <madko@linuxed.net> - 3.1.1-1
+- Upgrade to 3.1.1
 
 * Sun Jun  2 2019 Edouard Bourguignon <madko@linuxed.net> - 3.1.0-1
 - Upgrade to 3.1.0

[rpms/glances] epel10: upgrade to 3.1.4.1 and add glances.conf

[Edouard Bourguignon]

A new commit has been pushed.

Repo   : rpms/glances
Branch : epel10
Commit : a5cb5cc729dcd04df932ddbb289f0a1905d9af6a
Author : Edouard Bourguignon <madko@linuxed.net>
Date   : 2020-05-27T18:27:11+02:00
Stats  : +45/-29 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/glances/c/a5cb5cc729dcd04df932ddbb289f0a1905d9af6a?branch=epel10

Log:
upgrade to 3.1.4.1 and add glances.conf

---
diff --git a/disable-outdated-warning.patch b/disable-outdated-warning.patch
new file mode 100644
index 0000000..c3cfda3
--- /dev/null
+++ b/disable-outdated-warning.patch
@@ -0,0 +1,31 @@
+diff -Nurp glances-3.1.0.orig/glances/standalone.py glances-3.1.0/glances/standalone.py
+--- glances-3.1.0.orig/glances/standalone.py	2019-12-22 14:16:39.845870773 -0600
++++ glances-3.1.0/glances/standalone.py	2019-12-22 14:17:29.059115003 -0600
+@@ -29,7 +29,6 @@ from glances.stats import GlancesStats
+ from glances.outputs.glances_curses import GlancesCursesStandalone
+ from glances.outputs.glances_stdout import GlancesStdout
+ from glances.outputs.glances_stdout_csv import GlancesStdoutCsv
+-from glances.outdated import Outdated
+ from glances.timer import Counter
+ 
+ 
+@@ -92,9 +91,6 @@ class GlancesStandalone(object):
+             # Init screen
+             self.screen = GlancesCursesStandalone(config=config, args=args)
+ 
+-        # Check the latest Glances version
+-        self.outdated = Outdated(config=config, args=args)
+-
+     @property
+     def quiet(self):
+         return self._quiet
+@@ -156,9 +152,3 @@ class GlancesStandalone(object):
+ 
+         # Exit from export modules
+         self.stats.end()
+-
+-        # Check Glances version versus PyPI one
+-        if self.outdated.is_outdated():
+-            print("You are using Glances version {}, however version {} is available.".format(
+-                self.outdated.installed_version(), self.outdated.latest_version()))
+-            print("You should consider upgrading using: pip install --upgrade glances")

diff --git a/.gitignore b/.gitignore
index 8ed04d7..47ca501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /v3.1.0.tar.gz
 /v3.1.4.tar.gz
 /v3.1.4.1.tar.gz
+/glances.conf

diff --git a/glances.spec b/glances.spec
index 09f0f1b..f3db55e 100644
--- a/glances.spec
+++ b/glances.spec
@@ -3,19 +3,18 @@
 %{?python_enable_dependency_generator}
 Name:		glances	
 Version:	3.1.4.1
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	CLI curses based monitoring tool
 
+Group:		Applications/System		
 License:	GPLv3
 URL:		https://github.com/nicolargo/glances
 Source0:	https://github.com/nicolargo/glances/archive/v%{version}.tar.gz
-# disable warning that suggests updating via pip
-# https://bugzilla.redhat.com/show_bug.cgi?id=1773662
-Patch0:		disable-outdated-warning.patch
+Source1:	glances.conf
 BuildArch:	noarch
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
-BuildRequires:	python3-psutil >= 5.3.0
+BuildRequires:	python3-psutil >= 2.0.0
 
 %{?python_provide:%python_provide python3-%{name}}
 Provides:	python3-%{name} = %{version}-%{release}
@@ -28,15 +27,14 @@ Glances uses the PsUtil library to get information from your system.
 It is developed in Python.
 
 %prep
-%autosetup -n %{name}-%{version} -p 1
-# related to patch0
-rm glances/outdated.py
+%autosetup -n %{name}-%{version}
 
 %build
 %py3_build
 
 %install
 %py3_install
+%{__install} -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/glances/glances.conf
 
 %check
 %{__python3} setup.py test
@@ -44,6 +42,7 @@ rm glances/outdated.py
 %files
 %doc AUTHORS COPYING README.rst
 %license COPYING
+%{_sysconfdir}/glances/glances.conf
 %{_bindir}/glances
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/Glances-%{version}-py%{python3_version}.egg-info/
@@ -52,31 +51,15 @@ rm glances/outdated.py
 
 
 %changelog
-* Wed May 27 2020 Carl George <carl@george.computer> - 3.1.4.1-3
-- Add patch0 to disable outdated warning rhbz#1773662
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.1.4.1-2
-- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Richard Shaw <hobbes1069@gmail.com> - 3.1.4.1-1
-- Update to 3.1.4.1.
-- Update BR on psutil based on actual requirement generated.
-- Remove long obsolete Group tag in spec file.
+* Wed May 27 2020 Edouard Bourguignon <madko@linuxed.net> - 3.1.4.1-1
+- Upgrade to 3.1.4.1
+- Adding glances.conf to prevent update checks
 
 * Sat Mar 14 2020 Edouard Bourguignon <madko@linuxed.net> - 3.1.4-1
 - Upgrade to 3.1.4
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-3
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Fri Aug 16 2019 Edouard Bourguignon <madko@linuxed.net> - 3.1.1-1
+- Upgrade to 3.1.1
 
 * Sun Jun  2 2019 Edouard Bourguignon <madko@linuxed.net> - 3.1.0-1
 - Upgrade to 3.1.0

diff --git a/sources b/sources
index f7905eb..33f13c3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (v3.1.4.1.tar.gz) = 8e15149bde87d14d8176fe247e911a04b24900a95917e5711dfc8764ecec3238f696eea08c36bc59f68a4702e028909150e3318907f11fc53c5cc56441870ff3
+SHA512 (glances.conf) = 42a24daa6e7382c3c3ab79e76c21aff6f03cbf57682d6be2a86f1cd24fbd1fa1fd6afc5e8cb118188bde25aad9fcff759fd2b93e9a80ddbd94709a6098c94d79