osc copypac from project:home:alois:branches:Base:System package:htop revision:10

OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=45

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
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ Comment[zh_TW]=顯示系統行程
  Terminal=true
  Exec=htop
  Icon=htop
@@ -20,7 +16,7 @@ Index: htop.desktop
  GenericName=Process Viewer
  GenericName[ca]=Visor de processos
  GenericName[de]=Prozessanzeige
-@@ -62,4 +62,4 @@
+@@ -62,4 +62,4 @@ GenericName[tr]=Süreç Görüntüleyici
  GenericName[uk]=Перегляд процесів
  GenericName[zh_CN]=进程查看器
  GenericName[zh_TW]=行程檢視器

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,25 +1,34 @@
 -------------------------------------------------------------------
-Mon Feb  5 01:54:38 UTC 2018 - avindra@opensuse.org
+Mon Feb  5 14:44:35 UTC 2018 - aloisio@gmx.com
 
-- Update to version 2.1.0:
+- Update to version 2.1.0
-  * Compile-time option to disable setuid
+  * Linux: Delay accounting metrics
-  * 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
-  * Performance improvements in battery meter
+    (thanks to Tomasz Kramkowski)
-  * Update process TTY device
+  * Linux: performance improvements in battery meter
-  * Add support for sorting TASK_IDLE
+  * Linux: update process TTY device
-  * Add upper-bound to running process counter
+  * Linux: add support for sorting TASK_IDLE
-  * Bugfix: avoid crash when battery is removed
+    (thanks to Vladimir Panteleev)
-  * DragonFlyBSD support
+  * Linux: add upper-bound to running process counter
-- cleanup with spec-cleaner
+    (thanks to Lucas Correia Villa Real)
-- rebase htop-desktop-file-fix-thoenig-01.patch
+  * BUGFIX: avoid crash when battery is removed
-- use https
+    (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

@@ -22,19 +22,21 @@ Release:        0
 Summary:        An Interactive text-mode Process Viewer for Linux
 License:        GPL-2.0+
 Group:          System/Monitoring
-Url:            https://hisham.hm/htop
+URL:            https://hisham.hm/htop
 Source0:        https://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz
 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
-# python 3 has issues
+BuildRequires:  python3-base
-BuildRequires:  python2-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
@@ -44,7 +46,8 @@ but is also reported to work (and was originally developed) with the
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -53,7 +56,6 @@ but is also reported to work (and was originally developed) with the
   --enable-linux-affinity \
   --enable-taskstats \
   --enable-cgroup
-
 # forcefully exclude -L/usr/lib(64)/ncurses5 from being added on systems with
 # version 6 of ncurses. probably a cleaner way to fix this.
 %if 0%{?suse_version} > 1320
@@ -66,11 +68,13 @@ 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
 %doc COPYING