Accepting request 573317 from Base:System

- Small cleanup with spec-clener

- Update to version 2.1.0
  * Linux: Delay accounting metrics
    (thanks to André Carvalho)
  * Support for real-time signals
    (thanks to Kang-Che Sung)
  * 'c' key now works with threads as well
  * Session column renamed from SESN to SID
    (thanks to Kamyar Rasta)
  * Improved UI for meter style selection
    (thanks to Kang-Che Sung)
  * Improved code for constructing process tree
    (thanks to wangqr)
  * Compile-time option to disable setuid
  * Error checking of various standard library operations
  * Replacement of sprintf with snprintf
    (thanks to Tomasz Kramkowski)
  * Linux: performance improvements in battery meter
  * Linux: update process TTY device
  * Linux: add support for sorting TASK_IDLE
    (thanks to Vladimir Panteleev)
  * Linux: add upper-bound to running process counter
    (thanks to Lucas Correia Villa Real)
  * BUGFIX: avoid crash when battery is removed
    (thanks to Jan Chren)
- Refreshed htop-desktop-file-fix-thoenig-01.patch
- Added htop-script-python3.patch

OBS-URL: https://build.opensuse.org/request/show/573317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/htop?expand=0&rev=41

htop-2.0.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487
-size 476364

htop-2.0.2.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABCAAGBQJYNF5xAAoJED/Y9Dwrs8R4GJsP/jGZe2dtubo/+2p2aWlHaI3B
-WrmkNQxiX895ZZvJ1Ubm0h2Zy2lTH3cPNTTTeEtZF3ECx0yl/1TQwik29/LYWqEd
-AkMy8F3ESIS1a+EZJ879ONw4YRylNz3+w4+7vfCTnqF04+a7I8fHOguxqRNx58sA
-Caxs2P7M8au9cfJKv3rCCdw4/z6WKB7j/lHLKb13QI44mmvoNOthjtB0QU3yTUET
-C59ziG+e1YExQxzjwU50CbsHxQaOaFrzL3ajsZ0T68hboCJgFy+ZFJCHtZ7VtYiJ
-W1PHOmFMQGhj+7VYqXGzVHDag7Wd0mDU/ZHDDuIrx6HmKcTWqGcU82HAkJJop+5q
-WnYoP/uyGmwhXWp0ILbVu2JFAEHsiKkm516ISj3L2KyecTdKd9ySH1YycBFTLQdl
-i+MVpJ4GscB+37SQNZ5ufIIQNuW8Xuub5vckVmnzELO/H/OZ07SDUpf6HrbelHqh
-mJkh6Gnr//J2J1m91+wYDz3XUzvyeVLcXjq0B0yjGe8fyyOTrj//jcqPlRwoE5AV
-aZVLbZoHp55OU8qQuLhXAX2J5Se0LUAtqeWC4VLhQ28VNL8JN2B3sqo4EDAPnxke
-+tHwq6DOo0OD5TfHj0+yRqQZuchRFo9osUI48zW3OGeyT2FFFYvYGFL5tkHVx5kI
-FEsmetAaNsEyR8dE84km
-=qAl/
------END PGP SIGNATURE-----

htop-2.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748
+size 302938

htop-2.1.0.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJad1wsAAoJED/Y9Dwrs8R47lgP/1AvZyVGwqrJg82AARQ92i+J
+HKHlQRnR05qSljtCTLarrzZmXtKnsk7w6xM0U/IZQ5vYAcAiFeu89SCJf5spXqTx
+i6ueI7SeiPkEP2XCP+dhnpDzs7rTnOG9eHZBMY/c1CTHCePKAA12tUePihnkiGkJ
+RwNy0MXARKwcWTvVMCtdlasmc424LSDiqAy1o7wkFfEaIKZhYXVeJbk33dWXIxi2
+5G6fLdgmlfVa5ktu+V1t8IZsDs4L+6pJxGIsj6ELGioZbSoMkIBplIP+9lhITD1E
+7vezfv807uGFtvtgksBmRax7+kC5D5/iCTExdR7idq4wO1Zt5L73a7UEhR8v3SWX
+igiybn81/LQuQekeK7V9CHy598lvBOzX+tUdh5iKL3EElCRmVZM/NqGQsL9JQrDH
+lBrzT1aGAi7B9DwQ0v2DCD8US/QmSLLeB9bM5f8N8tnWPmFvWPvVUROxF1sldktt
+iuPcPXIXzeT0HArWL4rxzgJyMWic++qNGm3ilpi7XcDGzcZXTsh00ErTjD4lA201
+HTxWQzjXKus3WHKPdahBM9L7L9XgcsSjxR50WwVdGwochI5QbQx8vEL3IT9y3qaq
+5vtcwjen9kIFTdsfXRJfgwnGvyXgw63yetAxhzVLQGGXHiIB+3DMz/qp7jwaE7Um
+m8buFUmXIZ/b0LxWJ2CR
+=ffbR
+-----END PGP SIGNATURE-----

htop-desktop-file-fix-thoenig-01.patch

@@ -3,15 +3,11 @@ From: boombatower <jimmy@boombatower.com>
 Date: Thu, 11 Feb 2016 12:36:06 -0600
 Subject: [PATCH] Improve desktop file category.
 
----
+Index: htop-2.1.0/htop.desktop
- htop.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: htop.desktop
 ===================================================================
---- htop.desktop.orig
+--- htop-2.1.0.orig/htop.desktop
-+++ htop.desktop
++++ htop-2.1.0/htop.desktop
-@@ -32,7 +32,7 @@ Comment[zh_TW]=顯示系統行程
+@@ -33,7 +33,7 @@ Comment[zh_TW]=顯示系統行程
  Terminal=true
  Exec=htop
  Icon=htop
@@ -20,9 +16,9 @@ Index: htop.desktop
  GenericName=Process Viewer
  GenericName[ca]=Visor de processos
  GenericName[de]=Prozessanzeige
-@@ -60,4 +60,4 @@ GenericName[sv]=Processvisning
+@@ -62,4 +62,4 @@ GenericName[tr]=Süreç Görüntüleyici
- GenericName[tr]=Süreç Görüntüleyici
  GenericName[uk]=Перегляд процесів
+ GenericName[zh_CN]=进程查看器
  GenericName[zh_TW]=行程檢視器
 -Keywords=system;process;task
 +Keywords=system;process;task;

htop-script-python3.patch

@@ -0,0 +1,23 @@
+Index: htop-2.1.0/Makefile.in
+===================================================================
+--- htop-2.1.0.orig/Makefile.in
++++ htop-2.1.0/Makefile.in
+@@ -2388,7 +2388,7 @@ coverage:
+ 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-fprofile-arcs -ftest-coverage -DDEBUG" LDFLAGS="-lgcov"
+ 
+ .c.h:
+-	@srcdir@/scripts/MakeHeader.py $<
++	LC_ALL=en_US.UTF-8 @srcdir@/scripts/MakeHeader.py $<
+ 
+ cppcheck:
+ 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
+Index: htop-2.1.0/scripts/MakeHeader.py
+===================================================================
+--- htop-2.1.0.orig/scripts/MakeHeader.py
++++ htop-2.1.0/scripts/MakeHeader.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ import os, sys, string
+ try:
+    from cStringIO import StringIO

htop.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Tue Feb  6 13:44:23 UTC 2018 - mpluskal@suse.com
+
+- Small cleanup with spec-clener
+
+-------------------------------------------------------------------
+Mon Feb  5 14:44:35 UTC 2018 - aloisio@gmx.com
+
+- Update to version 2.1.0
+  * Linux: Delay accounting metrics
+    (thanks to André Carvalho)
+  * Support for real-time signals
+    (thanks to Kang-Che Sung)
+  * 'c' key now works with threads as well
+  * Session column renamed from SESN to SID
+    (thanks to Kamyar Rasta)
+  * Improved UI for meter style selection
+    (thanks to Kang-Che Sung)
+  * Improved code for constructing process tree
+    (thanks to wangqr)
+  * Compile-time option to disable setuid
+  * Error checking of various standard library operations
+  * Replacement of sprintf with snprintf
+    (thanks to Tomasz Kramkowski)
+  * Linux: performance improvements in battery meter
+  * Linux: update process TTY device
+  * Linux: add support for sorting TASK_IDLE
+    (thanks to Vladimir Panteleev)
+  * Linux: add upper-bound to running process counter
+    (thanks to Lucas Correia Villa Real)
+  * BUGFIX: avoid crash when battery is removed
+    (thanks to Jan Chren)
+
+- Refreshed htop-desktop-file-fix-thoenig-01.patch
+
+- Added htop-script-python3.patch
+
 -------------------------------------------------------------------
 Mon Jan  2 15:32:27 UTC 2017 - mpluskal@suse.com
 

htop.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package htop
 #
-# Copyright (c) 2017 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
@@ -17,23 +17,25 @@
 
 
 Name:           htop
-Version:        2.0.2
+Version:        2.1.0
 Release:        0
 Summary:        An Interactive text-mode Process Viewer for Linux
 License:        GPL-2.0+
 Group:          System/Monitoring
-Url:            http://hisham.hm/htop
+URL:            https://hisham.hm/htop
-Source0:        http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz
-Source1:        http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz.asc
+Source1:        https://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Patch0:         htop-desktop-file-fix-thoenig-01.patch
+# PATCH-FIX-OPENSUSE htop-script-python3.patch
+Patch1:         htop-script-python3.patch
 BuildRequires:  ncurses-devel
+BuildRequires:  python3-base
 BuildRequires:  update-desktop-files
 Requires(post): update-desktop-files
 Requires(postun): update-desktop-files
 Recommends:     lsof
 Recommends:     strace
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 htop is an interactive text-mode process viewer for Linux. It aims to
@@ -43,7 +45,8 @@ but is also reported to work (and was originally developed) with the
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -64,14 +67,15 @@ make %{?_smp_mflags}
 %make_install
 %suse_update_desktop_file -i %{name} System Monitor
 
+%if 0%{?suse_version} < 1500
 %post
 %desktop_database_post
 
 %postun
 %desktop_database_postun
+%endif
 
 %files
-%defattr(-,root,root)
 %doc COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop