Hello community,

here is the log from the commit of package iotop for openSUSE:Factory checked 
in at 2018-02-22 15:01:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
 and      /work/SRC/openSUSE:Factory/.iotop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "iotop"

Thu Feb 22 15:01:09 2018 rev:25 rq:578695 version:0.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes      2015-03-18 
13:07:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2018-02-22 
15:01:12.972658407 +0100
@@ -1,0 +2,16 @@
+Wed Feb 21 11:15:11 UTC 2018 - mvet...@suse.com
+
+- bsc#1081915: Port to python3:
+  * Add iotop-0.6-python3_build.patch: Upstream commit to fix
+    python build by replacing itervalues() with values(). ID is
+    99c8d7cedce81f17b851954d94bfa73787300599
+  * Add iotop-0.6-python3-header.patch: Replace header to use
+    python3
+- Add iotop-0.6-noendcurses.patch: to prevent problems when closing
+  terminal while running iotop (rh#1035503)
+- Run spec-cleaner:
+  * Remove py_requires
+  * Use man macro
+- Drop condition around noarch
+
+-------------------------------------------------------------------

New:
----
  iotop-0.6-noendcurses.patch
  iotop-0.6-python3-header.patch
  iotop-0.6-python3_build.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ iotop.spec ++++++
--- /var/tmp/diff_new_pack.JxOprb/_old  2018-02-22 15:01:13.996621569 +0100
+++ /var/tmp/diff_new_pack.JxOprb/_new  2018-02-22 15:01:14.000621425 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package iotop
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,20 +21,19 @@
 Version:        0.6
 Release:        0
 Summary:        Top Like UI to Show Per-Process I/O Going on
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          System/Monitoring
 Url:            http://guichaz.free.fr/iotop/
 Source0:        http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
 Source1:        http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2.asc
 Source2:        %{name}.keyring
+Patch0:         iotop-0.6-python3_build.patch
+Patch1:         iotop-0.6-python3-header.patch
+Patch2:         iotop-0.6-noendcurses.patch
 BuildRequires:  fdupes
-BuildRequires:  python-devel >= 2.7
-Requires:       python-curses
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%py_requires
-%if 0%{?suse_version} >= 1120
+BuildRequires:  python3-devel
+Requires:       python3-curses
 BuildArch:      noarch
-%endif
 
 %description
 Linux has always been able to show how much I/O was going on (the bi
@@ -45,19 +44,22 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-python setup.py build
+python3 setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot}
+python3 setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot}
 %fdupes -s %{buildroot}
 
 %files
-%defattr(-,root,root)
-%doc COPYING NEWS THANKS
+%license COPYING
+%doc NEWS THANKS
 %{_sbindir}/iotop
-%{_mandir}/man8/iotop.8.gz
+%{_mandir}/man8/iotop.8%{ext_man}
 %{python_sitelib}/*
 
 %changelog

++++++ iotop-0.6-noendcurses.patch ++++++
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
++++++ iotop-0.6-python3-header.patch ++++++
diff -urEbwB iotop-0.6/iotop.py iotop-0.6.new/iotop.py
--- iotop-0.6/iotop.py  2013-05-27 00:44:18.000000000 +0200
+++ iotop-0.6.new/iotop.py      2018-02-21 12:25:08.136286156 +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 <guic...@gmail.com>
 # GPL version 2 or later
diff -urEbwB iotop-0.6/sbin/iotop iotop-0.6.new/sbin/iotop
--- iotop-0.6/sbin/iotop        2013-05-27 00:44:18.000000000 +0200
+++ iotop-0.6.new/sbin/iotop    2018-02-21 12:25:13.924345875 +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 <guic...@gmail.com>, GPLv2
 # See iotop --help for some help
++++++ iotop-0.6-python3_build.patch ++++++
>From 99c8d7cedce81f17b851954d94bfa73787300599 Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrug...@fastmail.fm>
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 <cvubrug...@fastmail.fm>
Signed-off-by: Paul Wise <pa...@bonedaddy.net>
---
 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




Reply via email to