diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..558b436 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/iotop-0.6.tar.bz2 diff --git a/.iotop.metadata b/.iotop.metadata new file mode 100644 index 0000000..f3e24d0 --- /dev/null +++ b/.iotop.metadata @@ -0,0 +1 @@ +a65daa859fc44d6a21414c1d358333dda51044cd SOURCES/iotop-0.6.tar.bz2 diff --git a/SOURCES/iotop-0.3.2-batchprintutf8.patch b/SOURCES/iotop-0.3.2-batchprintutf8.patch new file mode 100644 index 0000000..4e63bc0 --- /dev/null +++ b/SOURCES/iotop-0.3.2-batchprintutf8.patch @@ -0,0 +1,12 @@ +diff -up iotop-0.6/iotop/ui.py.batchprintutf8 iotop-0.6/iotop/ui.py +--- iotop-0.6/iotop/ui.py.batchprintutf8 2016-11-14 11:21:23.690185257 +0100 ++++ iotop-0.6/iotop/ui.py 2016-11-14 11:23:26.511040007 +0100 +@@ -444,7 +444,7 @@ class IOTopUI(object): + if self.options.quiet <= int(first_time): + print(''.join(titles)) + for l in lines: +- print(l) ++ print(l.encode('utf-8')) + sys.stdout.flush() + else: + self.win.erase() diff --git a/SOURCES/iotop-0.6-noendcurses.patch b/SOURCES/iotop-0.6-noendcurses.patch new file mode 100644 index 0000000..b3529d4 --- /dev/null +++ b/SOURCES/iotop-0.6-noendcurses.patch @@ -0,0 +1,21 @@ +diff -up iotop-0.6/iotop/ui.py.noendcurses iotop-0.6/iotop/ui.py +--- iotop-0.6/iotop/ui.py.noendcurses 2014-12-03 17:50:38.941430261 +0100 ++++ iotop-0.6/iotop/ui.py 2014-12-03 17:51:40.108064465 +0100 +@@ -520,6 +525,17 @@ Please do not file bugs on iotop about t + sys.exit(1) + else: + raise ++ except curses.error as e: ++ stre = str(e) ++ if stre.find('ERR')>=0 and ( ++ stre.find('nocbreak()')>=0 or stre.find('endwin()')>=0 ++ ): ++ pass ++ # endwin and nocbreak can cause error (and raise hard to catch ++ # exception) if iotop was running in the terminal and that ++ # terminal got closed while iotop was still running ++ else: ++ raise + + # + # Profiling diff --git a/SOURCES/iotop-0.6-python3.patch b/SOURCES/iotop-0.6-python3.patch new file mode 100644 index 0000000..550a194 --- /dev/null +++ b/SOURCES/iotop-0.6-python3.patch @@ -0,0 +1,9 @@ +diff -ru iotop-0.6.orign/sbin/iotop iotop-0.6/sbin/iotop +--- iotop-0.6.orign/sbin/iotop 2013-05-27 00:44:18.000000000 +0200 ++++ iotop-0.6/sbin/iotop 2015-11-15 22:47:24.468058681 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # iotop: Display I/O usage of processes in a top like UI + # Copyright (c) 2007, 2008 Guillaume Chazarain , GPLv2 + # See iotop --help for some help diff --git a/SOURCES/iotop-python3build.patch b/SOURCES/iotop-python3build.patch new file mode 100644 index 0000000..55b73db --- /dev/null +++ b/SOURCES/iotop-python3build.patch @@ -0,0 +1,32 @@ +From 99c8d7cedce81f17b851954d94bfa73787300599 Mon Sep 17 00:00:00 2001 +From: Christophe Vu-Brugier +Date: Fri, 17 Oct 2014 13:49:31 +0200 +Subject: [PATCH] Fix build error with Python 3 caused by itervalues() in + setup.py + +The itervalues() method is not available in Python 3. As a +consequence, this patch replaces the call to itervalues() in setup.py +with a call to values() which works on both Python 2 and Python 3. + +Signed-off-by: Christophe Vu-Brugier +Signed-off-by: Paul Wise +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7150102..9de6068 100755 +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ from iotop.version import VERSION + # Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/ + # while still honoring the choice of installing into local/ or not. + if hasattr(distutils_install, 'INSTALL_SCHEMES'): +- for d in distutils_install.INSTALL_SCHEMES.itervalues(): ++ for d in distutils_install.INSTALL_SCHEMES.values(): + if d.get('scripts', '').endswith('/bin'): + d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin' + +-- +2.4.10.GIT + diff --git a/SPECS/iotop.spec b/SPECS/iotop.spec new file mode 100644 index 0000000..5e38ba6 --- /dev/null +++ b/SPECS/iotop.spec @@ -0,0 +1,165 @@ +Name: iotop +Version: 0.6 +Release: 16%{?dist} +Summary: Top like utility for I/O +License: GPLv2+ +URL: http://guichaz.free.fr/iotop/ +Source0: http://guichaz.free.fr/iotop/files/%{name}-%{version}.tar.bz2 + +# rhbz#1035503 +Patch0: iotop-0.6-noendcurses.patch +Patch1: iotop-0.6-python3.patch + +# Fix build error with Python 3 caused by itervalues() in setup.py +# http://repo.or.cz/iotop.git/commit/99c8d7cedce81f17b851954d94bfa73787300599 +Patch2: iotop-python3build.patch + +# sent upstream, iotop <= 0.6, rhbz#1285088 +Patch3: iotop-0.3.2-batchprintutf8.patch + +BuildArch: noarch +BuildRequires: python3-devel + +%description +Linux has always been able to show how much I/O was going on +(the bi and bo columns of the vmstat 1 command). +iotop is a Python program with a top like UI used to +show of behalf of which process is the I/O going on. + +%prep +%setup -n %{name}-%{version} +%patch0 -p1 -b .noendcurses +%patch1 -p1 -b .python3 +%patch2 -p1 +%patch3 -p1 -b .batchprintutf8 + +%build +%py3_build + +%install +%py3_install + +%files -n %{name} +%doc NEWS THANKS README ChangeLog +%license COPYING +%{python3_sitelib}/* +%{_sbindir}/iotop +%{_mandir}/man8/iotop.* + +%changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 0.6-13 +- Rebuild for Python 3.6 + +* Mon Nov 14 2016 Michal Hlavinka - 0.6-12 +- fix printing unicode strings in batch mode (#1285088) + +* Tue Jul 19 2016 Fedora Release Engineering - 0.6-11 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Feb 29 2016 Charalampos Stratakis - 0.6-10 +- SPEC file cleanup +- Added licence tag +- Removal of old and unneeded macros +- Use of newest python macros +- Removed Python 2 dependency +- Added patch for Python 3 build + +* Thu Feb 04 2016 Fedora Release Engineering - 0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Nov 15 2015 Adel Gadllah - 0.6-8 +- Fix python3 patch + +* Sun Nov 15 2015 Adel Gadllah - 0.6-7 +- Rebuilt with python3 - RH#1282262 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jan 30 2015 Michal Hlavinka - 0.6-5 +- always ignore nocbreak errors, there is way too many false positives (#1035503) + +* Wed Dec 03 2014 Michal Hlavinka - 0.6-4 +- ignore curses failures during termination (#1035503) + +* Sat Jun 07 2014 Fedora Release Engineering - 0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed May 29 2013 Michal Hlavinka - 0.6-1 +- iotop updated to 0.6 + +* Tue Feb 05 2013 Michal Hlavinka - 0.5-1 +- iotop updated to 0.5 + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 16 2011 Michal Hlavinka - 0.4.4-1 +- iotop updated to 0.4.4 + +* Fri Oct 14 2011 Michal Hlavinka 0.4.3-3 +- fix typo in last patch + +* Thu Oct 13 2011 Michal Hlavinka 0.4.3-2 +- after CVE-2011-2494 fix, iotop needs root privileges + +* Sun Sep 18 2011 Adel Gadllah 0.4.3-1 +- New upstream version + +* Wed Feb 09 2011 Fedora Release Engineering - 0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Jan 12 2010 Adel Gadllah 0.4-1 +- New upstream version + +* Fri Jul 24 2009 Fedora Release Engineering - 0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue May 19 2009 Adel Gadllah 0.3-1 +- New upstream version +- fixes RH #475917 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.2.1-2 +- Rebuild for Python 2.6 + +* Wed Jul 09 2008 Adel Gadllah 0.2.1-1 +- Update to 0.2.1 + +* Mon Jul 07 2008 Adel Gadllah 0.2-2 +- New upstream tarball.. + +* Mon May 26 2008 Adel Gadllah 0.2-1 +- Update to new upstream version + +* Fri Dec 28 2007 Adel Gadllah 0.1-3 +- Fix build issue + +* Fri Dec 28 2007 Adel Gadllah 0.1-2 +- Fix traceback on xterm-color RH #400071 + +* Sat Nov 3 2007 Adel Gadllah 0.1-1 +- Fix version + +* Sat Nov 3 2007 Adel Gadllah 20070930-1 +- Initial Build