diff --git a/.gitignore b/.gitignore index a5734ff..28515d7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /glances-1.3.5.tar.gz /glances-1.3.6.tar.gz /glances-1.3.7.tar.gz +/glances-1.4.tar.gz diff --git a/glances.spec b/glances.spec index 29bf940..d14de3a 100644 --- a/glances.spec +++ b/glances.spec @@ -1,6 +1,6 @@ Name: glances -Version: 1.3.7 -Release: 3%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: CLI curses based monitoring tool Group: Applications/System @@ -9,50 +9,44 @@ URL: https://github.com/nicolargo/glances Source0: https://github.com/downloads/nicolargo/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: automake -%if 0%{?el5} -BuildRequires: python26-devel -%else -BuildRequires: python-devel -%endif -Requires: pystatgrab >= 0.5 +BuildRequires: python-setuptools-devel %description Glances is a CLI curses based monitoring tool for both GNU/Linux and BSD. -Glances uses the libstatgrab library to get information from your system. -Glances is developed in Python and uses the python-statgrab lib. +Glances uses the PsUtil library to get information from your system. +It is developed in Python. %prep %setup -q %build -%configure -make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -rm -rf %{buildroot}/usr/doc/glances -sed -i '1d' %{buildroot}/%{python_sitelib}/%{name}/%{name}.py -mv %{buildroot}/%{_bindir}/glances.py %{buildroot}/%{_bindir}/glances +%{__python} setup.py install --skip-build --root %{buildroot} +%find_lang %{name} + %clean rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc AUTHORS COPYING README TODO %{_bindir}/glances -%{python_sitelib}/glances +%{python_sitelib}/* +%{_datadir}/doc/glances +%{_datadir}/glances %{_datadir}/man/man1/glances.1.gz %changelog +* Tue Aug 21 2012 Edouard Bourguignon - 1.4-1 +- Upgrade to version 1.4 + * Thu Jul 19 2012 Fedora Release Engineering - 1.3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 1368800..2b38b0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3ba87e0b336b909b7f305b9431ea0f2 glances-1.3.7.tar.gz +d56105fe51bafb170ad5f115c26ef4a1 glances-1.4.tar.gz