diff --git a/.gitignore b/.gitignore index 28515d7..afeb8d2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /glances-1.3.6.tar.gz /glances-1.3.7.tar.gz /glances-1.4.tar.gz +/glances-1.4.1.1.tar.gz diff --git a/glances.spec b/glances.spec index 9686bbb..6e733d9 100644 --- a/glances.spec +++ b/glances.spec @@ -1,6 +1,11 @@ +%if 0%{?rhel} && 0%{?rhel} <= 5 +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + Name: glances -Version: 1.4 -Release: 2%{?dist} +Version: 1.4.1.1 +Release: 1%{?dist} Summary: CLI curses based monitoring tool Group: Applications/System @@ -10,9 +15,13 @@ Source0: https://github.com/downloads/nicolargo/%{name}/%{name}-%{version}.tar.g Patch0: glances_remove_shebang.patch BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%if 0%{?rhel} && 0%{?rhel} <= 5 +BuildRequires: python-setuptools +%else BuildRequires: python-setuptools-devel +%endif Requires: python-setuptools -Requires: python-psutil +Requires: python-psutil >= 0.4.1 %description Glances is a CLI curses based monitoring tool for both GNU/Linux and BSD. @@ -48,6 +57,9 @@ rm -rf %{buildroot} %{_datadir}/man/man1/glances.1.gz %changelog +* Sat Sep 1 2012 Edouard Bourguignon - 1.4.1.1-1 +- Upgrade to 1.4.1.1 + * Tue Aug 21 2012 Edouard Bourguignon - 1.4-2 - Adding missing dependencies - Removing shebang in non-executable files diff --git a/sources b/sources index 2b38b0e..5c7511b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d56105fe51bafb170ad5f115c26ef4a1 glances-1.4.tar.gz +43acf579e3303350844ed3ef2c7d73fa glances-1.4.1.1.tar.gz