From b7d643e0de191858cd2d8828b2dd292446ff677cc475457d2ca677d0e95a0358 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 31 Aug 2020 07:43:58 +0000 Subject: [PATCH] Accepting request 830503 from home:avindra:branches:Base:System - Update to version 3.0.0 * Add simple, optional vim key mapping mode * Support more than 2 smaller CPU meter columns * Support Linux proportional set size metrics * Support Linux pressure stall information metrics * New display option to show CPU frequency in CPU meters * Update Linux sysfs battery discovery for recent kernels * Add hardware topology information in the affinity panel * Add timestamp reporting to the strace screen * Added an option to disable the mouse * Without an argument -u uses $USER value automatically * Support less(1) search navigation shortcuts * Support ZFS ARC statistics * Report values larger than 100 terabytes * Widen ST_UID (UID) column to allow for UIDs > 9999 * BUGFIX: fix makefiles for building with clang * BUGFIX: fix major() usage * BUGFIX: correctly identify other types of zombie process * BUGFIX: improve follow-process handling in some situations * BUGFIX: fix custom meters reverting to unexpected setting * BUGFIX: close pipe after running lsof(1) * BUGFIX: meters honour setting of counting CPUs from 0/1 - Drop htop-2.2.0.tar.gz.asc - no sig provided - Upstreamed patches removed: * Drop htop-2.2.0-fix-linux-process-ordering.patch * Drop htop-2.2.0-fix-option-string.patch * Drop htop-2.2.0-gcc10.patch * Drop htop-desktop-file-fix-thoenig-01.patch * Drop htop-script-python3.patch OBS-URL: https://build.opensuse.org/request/show/830503 OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=52 --- htop-2.2.0-fix-linux-process-ordering.patch | 13 ------- htop-2.2.0-fix-option-string.patch | 13 ------- htop-2.2.0-gcc10.patch | 39 --------------------- htop-2.2.0.tar.gz | 3 -- htop-2.2.0.tar.gz.asc | 17 --------- htop-3.0.0.tar.gz | 3 ++ htop-desktop-file-fix-thoenig-01.patch | 24 ------------- htop-script-python3.patch | 19 ---------- htop.changes | 33 +++++++++++++++++ htop.spec | 20 ++++------- 10 files changed, 43 insertions(+), 141 deletions(-) delete mode 100644 htop-2.2.0-fix-linux-process-ordering.patch delete mode 100644 htop-2.2.0-fix-option-string.patch delete mode 100644 htop-2.2.0-gcc10.patch delete mode 100644 htop-2.2.0.tar.gz delete mode 100644 htop-2.2.0.tar.gz.asc create mode 100644 htop-3.0.0.tar.gz delete mode 100644 htop-desktop-file-fix-thoenig-01.patch delete mode 100644 htop-script-python3.patch diff --git a/htop-2.2.0-fix-linux-process-ordering.patch b/htop-2.2.0-fix-linux-process-ordering.patch deleted file mode 100644 index 0ecf7f5..0000000 --- a/htop-2.2.0-fix-linux-process-ordering.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: htop-2.2.0/linux/LinuxProcess.c -=================================================================== ---- htop-2.2.0.orig/linux/LinuxProcess.c -+++ htop-2.2.0/linux/LinuxProcess.c -@@ -143,7 +143,7 @@ typedef struct LinuxProcess_ { - } LinuxProcess; - - #ifndef Process_isKernelThread --#define Process_isKernelThread(_process) ((LinuxProcess*)(_process)->isKernelThread) -+#define Process_isKernelThread(_process) (((LinuxProcess*)(_process))->isKernelThread) - #endif - - #ifndef Process_isUserlandThread diff --git a/htop-2.2.0-fix-option-string.patch b/htop-2.2.0-fix-option-string.patch deleted file mode 100644 index 789ec36..0000000 --- a/htop-2.2.0-fix-option-string.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: htop-2.2.0/htop.c -=================================================================== ---- htop-2.2.0.orig/htop.c -+++ htop-2.2.0/htop.c -@@ -93,7 +93,7 @@ static CommandLineSettings parseArgument - - int opt, opti=0; - /* Parse arguments */ -- while ((opt = getopt_long(argc, argv, "hvCst::d:u:p:i", long_opts, &opti))) { -+ while ((opt = getopt_long(argc, argv, "hvCs:td:u:p:i", long_opts, &opti))) { - if (opt == EOF) break; - switch (opt) { - case 'h': diff --git a/htop-2.2.0-gcc10.patch b/htop-2.2.0-gcc10.patch deleted file mode 100644 index 68d8096..0000000 --- a/htop-2.2.0-gcc10.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Thu, 23 Jan 2020 17:27:10 +0100 -Subject: [PATCH 1/2] Fix GCC 10 switch to `-fno-common` default - ---- - CRT.h | 6 +++--- - linux/LinuxProcess.h | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -Index: htop-2.2.0/CRT.h -=================================================================== ---- htop-2.2.0.orig/CRT.h -+++ htop-2.2.0/CRT.h -@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; - - extern int CRT_delay; - --int* CRT_colors; -+extern int* CRT_colors; - - extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; - -@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; - - extern int CRT_scrollWheelVAmount; - --char* CRT_termType; -+extern char* CRT_termType; - - // TODO move color scheme to Settings, perhaps? - - extern int CRT_colorScheme; - --void *backtraceArray[128]; -+extern void *backtraceArray[128]; - - #if HAVE_SETUID_ENABLED - diff --git a/htop-2.2.0.tar.gz b/htop-2.2.0.tar.gz deleted file mode 100644 index 38fc620..0000000 --- a/htop-2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 -size 308109 diff --git a/htop-2.2.0.tar.gz.asc b/htop-2.2.0.tar.gz.asc deleted file mode 100644 index fd97b8d..0000000 --- a/htop-2.2.0.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJazL+eAAoJED/Y9Dwrs8R4iAMQAJj3R7tLyN1JUItrtnybaKK7 -JvBEmzVO4ihOdz3mW3kiLAE2+g5tY2nWGPtDEyBb25rP/h604vqm8Nd6zDiFLH0d -vQzDOYbOEqkOlGIuP5ahCwEB0Zec6s1rxN6Ulqcy61amTzp4efdYPcdfTdNBMcZz -IO86OodqjPguJFX0uYLMQ135ZvHTMzYBi6+AVfkkwFz8KpQBid1htyWxqFcGh9Lz -K1Cbf5gQv0IyDspzKulDRzJzH6otCw+d649ALOE1NFZNzrDjEas6mJBHqGRe4BG5 -8YaS+wsPjSsc8YOETgBIEkd2wgjvAQwWRqGm4krFGCevh5NNYLCW//CiDK7KYrgi -OStbffo7VQvtzSdc5EJqMU5U34ZJU302kKBUxwHV7uhLxBin8P4ssg8xKCHo8iPr -EfCTYtGfEdYdQjjsuV/y+0PhBsGEpoyOqX1Yz7XUBFMsvYKhhEe67XSA2SI6X4DI -7gvoxaH8Xe3qeBbbUZG9hl7sa0hjmdLJKX0xoCXO6jIAayOO99dnXs9WmE4PXOSd -YvXUwa3nQBpiI+GSaHmdbKJU+xBMz1Dks88dkf2MvN+kiZXSj69VmTU6zh1vXisX -Yi5ftJY0vwircskgTiiNolQr88QNWWj+86zdbqAyERzt65bMBKnaIvKWjtenPUVI -qnlpieqL3D3M62PDh7fj -=Eu78 ------END PGP SIGNATURE----- diff --git a/htop-3.0.0.tar.gz b/htop-3.0.0.tar.gz new file mode 100644 index 0000000..ffb181a --- /dev/null +++ b/htop-3.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c0661f0ae5f4e2874da250b60cd515e4ac4c041583221adfe95f10e18d1a4e6 +size 179371 diff --git a/htop-desktop-file-fix-thoenig-01.patch b/htop-desktop-file-fix-thoenig-01.patch deleted file mode 100644 index 0634773..0000000 --- a/htop-desktop-file-fix-thoenig-01.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7471273005031559c5fa05ffa11a7bca4ff647b0 Mon Sep 17 00:00:00 2001 -From: boombatower -Date: Thu, 11 Feb 2016 12:36:06 -0600 -Subject: [PATCH] Improve desktop file category. - -Index: htop-2.1.0/htop.desktop -=================================================================== ---- htop-2.1.0.orig/htop.desktop -+++ htop-2.1.0/htop.desktop -@@ -33,7 +33,7 @@ Comment[zh_TW]=顯示系統行程 - Terminal=true - Exec=htop - Icon=htop --Categories=ConsoleOnly;System; -+Categories=System;Monitor; - GenericName=Process Viewer - GenericName[ca]=Visor de processos - GenericName[de]=Prozessanzeige -@@ -62,4 +62,4 @@ GenericName[tr]=Süreç Görüntüleyici - GenericName[uk]=Перегляд процесів - GenericName[zh_CN]=进程查看器 - GenericName[zh_TW]=行程檢視器 --Keywords=system;process;task -+Keywords=system;process;task; diff --git a/htop-script-python3.patch b/htop-script-python3.patch deleted file mode 100644 index 2e9737e..0000000 --- a/htop-script-python3.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Makefile.in -+++ b/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 ---- a/scripts/MakeHeader.py -+++ b/scripts/MakeHeader.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - import os, sys, string, io - try: - from StringIO import StringIO diff --git a/htop.changes b/htop.changes index c532707..9b29952 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sat Aug 29 19:17:23 UTC 2020 - Avindra Goolcharan + +- Update to version 3.0.0 + * Add simple, optional vim key mapping mode + * Support more than 2 smaller CPU meter columns + * Support Linux proportional set size metrics + * Support Linux pressure stall information metrics + * New display option to show CPU frequency in CPU meters + * Update Linux sysfs battery discovery for recent kernels + * Add hardware topology information in the affinity panel + * Add timestamp reporting to the strace screen + * Added an option to disable the mouse + * Without an argument -u uses $USER value automatically + * Support less(1) search navigation shortcuts + * Support ZFS ARC statistics + * Report values larger than 100 terabytes + * Widen ST_UID (UID) column to allow for UIDs > 9999 + * BUGFIX: fix makefiles for building with clang + * BUGFIX: fix major() usage + * BUGFIX: correctly identify other types of zombie process + * BUGFIX: improve follow-process handling in some situations + * BUGFIX: fix custom meters reverting to unexpected setting + * BUGFIX: close pipe after running lsof(1) + * BUGFIX: meters honour setting of counting CPUs from 0/1 +- Drop htop-2.2.0.tar.gz.asc - no sig provided +- Upstreamed patches removed: + * Drop htop-2.2.0-fix-linux-process-ordering.patch + * Drop htop-2.2.0-fix-option-string.patch + * Drop htop-2.2.0-gcc10.patch + * Drop htop-desktop-file-fix-thoenig-01.patch + * Drop htop-script-python3.patch + ------------------------------------------------------------------- Fri Jun 5 07:07:31 UTC 2020 - Martin Pluskal diff --git a/htop.spec b/htop.spec index dfcb4ba..62f9ace 100644 --- a/htop.spec +++ b/htop.spec @@ -17,24 +17,16 @@ Name: htop -Version: 2.2.0 +Version: 3.0.0 Release: 0 Summary: An Interactive text-mode Process Viewer for Linux License: GPL-2.0-or-later Group: System/Monitoring -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 +URL: https://htop.dev +Source0: https://github.com/htop-dev/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source2: %{name}.keyring -Patch0: htop-desktop-file-fix-thoenig-01.patch -# PATCH-FIX-OPENSUSE htop-script-python3.patch -Patch1: htop-script-python3.patch -# PATCH-FIX-UPSTREAM This broke with commit db05ba61065f64b59d0014518be0786b5439e54c -- allow args for specific options -Patch2: htop-2.2.0-fix-option-string.patch -# PATCH-FIX-UPSTREAM Make sure the auto-regenerated headers (after scripts/MakeHeader.py) actually compile -Patch3: htop-2.2.0-fix-linux-process-ordering.patch -# PATCH-FIX-OPENSUSE htop-2.2.0-gcc10.patch https://github.com/hishamhm/htop/pull/981 -Patch4: htop-2.2.0-gcc10.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: pkgconfig >= 0.9.0 BuildRequires: python3-base BuildRequires: update-desktop-files @@ -50,6 +42,8 @@ better 'top' and requires ncurses. %prep %autosetup -p1 +# Standard release tarball is not provided https://github.com/htop-dev/htop/issues/31 +autoreconf -fi %build %configure \