[rpms/glances] epel10: Upgrade to 1.6

[rpms/glances] epel10: Upgrade to 1.6

[Edouard Bourguignon]

A new commit has been pushed.

Repo   : rpms/glances
Branch : epel10
Commit : 9dbd012561ae8139c45bea717936885fb87211bf
Author : Edouard Bourguignon <madko@linuxed.net>
Date   : 2013-03-16T03:55:08+01:00
Stats  : +11/-20 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/glances/c/9dbd012561ae8139c45bea717936885fb87211bf?branch=epel10

Log:
Upgrade to 1.6

---
diff --git a/.gitignore b/.gitignore
index e5c33a5..8d29f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /glances-1.5.tar.gz
 /glances-1.5.1.tar.gz
 /glances-1.5.2.tar.gz
+/glances-1.6.tar.gz

diff --git a/glances-1.5.2-noSuchProcess.patch b/glances-1.5.2-noSuchProcess.patch
deleted file mode 100644
index caf6273..0000000
--- a/glances-1.5.2-noSuchProcess.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur glances-1.5.2.ori/glances/glances.py glances-1.5.2/glances/glances.py
---- glances-1.5.2.ori/glances/glances.py	2012-12-28 18:50:56.000000000 +0100
-+++ glances-1.5.2/glances/glances.py	2013-02-22 06:41:35.073000000 +0100
-@@ -575,6 +575,8 @@
-             except KeyError:
-                 # Key did not exist, create it
-                 self.processcount[str(proc.status)] = 1
-+            except NoSuchProcess:
-+                continue
-             self.processcount['total'] += 1
- 
-     def getcount(self):

diff --git a/glances.spec b/glances.spec
index d3b18dc..42b0220 100644
--- a/glances.spec
+++ b/glances.spec
@@ -4,15 +4,14 @@
 %endif
 
 Name:		glances		
-Version:	1.5.2
-Release:	3%{?dist}
+Version:	1.6
+Release:	1%{?dist}
 Summary:	CLI curses based monitoring tool
 
 Group:		Applications/System		
 License:	GPLv3
 URL:		https://github.com/nicolargo/glances
 Source0:	https://github.com/downloads/nicolargo/%{name}/%{name}-%{version}.tar.gz
-Patch0:		glances-1.5.2-noSuchProcess.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %if 0%{?rhel} && 0%{?rhel} <= 5
@@ -32,8 +31,6 @@ It is developed in Python.
 
 %prep
 %setup -q
-%patch0 -p1
-
 
 %build
 
@@ -41,6 +38,7 @@ It is developed in Python.
 %install
 %{__python} setup.py install --root %{buildroot}
 %find_lang %{name}
+mv %{buildroot}/usr/etc/ %{buildroot}
 
 
 %clean
@@ -51,6 +49,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO 
 %{_bindir}/glances
+%config(noreplace) %{_sysconfdir}/glances
 %attr(0655,-,-) %{python_sitelib}/glances/glances.py
 %attr(0655,-,-) %{python_sitelib}/glances/unitest.py
 %{python_sitelib}/*
@@ -59,11 +58,14 @@ rm -rf %{buildroot}
 %{_datadir}/man/man1/glances.1.gz
 
 %changelog
+* Sat Mar 16 2013 Edouard Bourguignon <madko@linuxed.net> - 1.6-1
+- Upgrade to 1.6
+
 * Sat Feb 23 2013 Edouard Bourguignon <madko@linuxed.net> - 1.5.2-3
 - Patch to fix bug #914837 (noSuchProcess)
 
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Sat Jan 12 2013 Edouard Bourguignon <madko@linuxed.net> - 1.5.2-2
+- Patch to initialize y in displayMem (bug #894347)
 
 * Sun Dec 30 2012 Edouard Bourguignon <madko@linuxed.net> - 1.5.2-1
 - Upgrade to 1.5.2

diff --git a/sources b/sources
index 3a3c1ae..13f5505 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30c2db626b23de71704a8782c7243873  glances-1.5.2.tar.gz
+2e98bfcd996353bc6c7720fe72fc99cd  glances-1.6.tar.gz