From 19632484419de64a507ce017d9608cef93428dcdbbe1b5411bad853e00cf0f67 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 6 Feb 2018 08:14:51 +0000 Subject: [PATCH 1/3] Accepting request 573183 from home:avindra - Update to version 2.1.0: * Compile-time option to disable setuid * Delay accounting metrics * Support for real-time signals * 'c' key now works with threads as well * Session column renamed from SESN to SID * Improved UI for meter style selection * Improved code for constructing process tree * Error checking of various standard library operations * Replacement of sprintf with snprintf * Performance improvements in battery meter * Update process TTY device * Add support for sorting TASK_IDLE * Add upper-bound to running process counter * Bugfix: avoid crash when battery is removed * DragonFlyBSD support - cleanup with spec-cleaner - rebase htop-desktop-file-fix-thoenig-01.patch - use https OBS-URL: https://build.opensuse.org/request/show/573183 OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=44 --- htop-2.0.2.tar.gz | 3 --- htop-2.0.2.tar.gz.asc | 17 ----------------- htop-2.1.0.tar.gz | 3 +++ htop-2.1.0.tar.gz.asc | 17 +++++++++++++++++ htop-desktop-file-fix-thoenig-01.patch | 6 +++--- htop.changes | 23 +++++++++++++++++++++++ htop.spec | 15 ++++++++------- 7 files changed, 54 insertions(+), 30 deletions(-) delete mode 100644 htop-2.0.2.tar.gz delete mode 100644 htop-2.0.2.tar.gz.asc create mode 100644 htop-2.1.0.tar.gz create mode 100644 htop-2.1.0.tar.gz.asc diff --git a/htop-2.0.2.tar.gz b/htop-2.0.2.tar.gz deleted file mode 100644 index dfb4827..0000000 --- a/htop-2.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487 -size 476364 diff --git a/htop-2.0.2.tar.gz.asc b/htop-2.0.2.tar.gz.asc deleted file mode 100644 index 7311c4b..0000000 --- a/htop-2.0.2.tar.gz.asc +++ /dev/null @@ -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----- diff --git a/htop-2.1.0.tar.gz b/htop-2.1.0.tar.gz new file mode 100644 index 0000000..2152150 --- /dev/null +++ b/htop-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748 +size 302938 diff --git a/htop-2.1.0.tar.gz.asc b/htop-2.1.0.tar.gz.asc new file mode 100644 index 0000000..5dc8398 --- /dev/null +++ b/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----- diff --git a/htop-desktop-file-fix-thoenig-01.patch b/htop-desktop-file-fix-thoenig-01.patch index cf86246..076669e 100644 --- a/htop-desktop-file-fix-thoenig-01.patch +++ b/htop-desktop-file-fix-thoenig-01.patch @@ -11,7 +11,7 @@ Index: htop.desktop =================================================================== --- htop.desktop.orig +++ htop.desktop -@@ -32,7 +32,7 @@ Comment[zh_TW]=顯示系統行程 +@@ -33,7 +33,7 @@ Terminal=true Exec=htop Icon=htop @@ -20,9 +20,9 @@ Index: htop.desktop GenericName=Process Viewer GenericName[ca]=Visor de processos GenericName[de]=Prozessanzeige -@@ -60,4 +60,4 @@ GenericName[sv]=Processvisning - GenericName[tr]=Süreç Görüntüleyici +@@ -62,4 +62,4 @@ GenericName[uk]=Перегляд процесів + GenericName[zh_CN]=进程查看器 GenericName[zh_TW]=行程檢視器 -Keywords=system;process;task +Keywords=system;process;task; diff --git a/htop.changes b/htop.changes index f3dcc19..19f462d 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Feb 5 01:54:38 UTC 2018 - avindra@opensuse.org + +- Update to version 2.1.0: + * Compile-time option to disable setuid + * Delay accounting metrics + * Support for real-time signals + * 'c' key now works with threads as well + * Session column renamed from SESN to SID + * Improved UI for meter style selection + * Improved code for constructing process tree + * Error checking of various standard library operations + * Replacement of sprintf with snprintf + * Performance improvements in battery meter + * Update process TTY device + * Add support for sorting TASK_IDLE + * Add upper-bound to running process counter + * Bugfix: avoid crash when battery is removed + * DragonFlyBSD support +- cleanup with spec-cleaner +- rebase htop-desktop-file-fix-thoenig-01.patch +- use https + ------------------------------------------------------------------- Mon Jan 2 15:32:27 UTC 2017 - mpluskal@suse.com diff --git a/htop.spec b/htop.spec index 8efa7a7..eef0458 100644 --- a/htop.spec +++ b/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,24 @@ 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 -Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz -Source1: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz.asc +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 BuildRequires: ncurses-devel +# python 3 has issues +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 @@ -52,6 +53,7 @@ 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 @@ -71,7 +73,6 @@ make %{?_smp_mflags} %desktop_database_postun %files -%defattr(-,root,root) %doc COPYING %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop From 84e180940ae0a2ec42eda09693d58aa0102a74d355c44f1b10f91f54b384d10d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 6 Feb 2018 13:41:01 +0000 Subject: [PATCH 2/3] 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 | 14 ++++------- htop-script-python3.patch | 23 +++++++++++++++++ htop.changes | 35 ++++++++++++++++---------- htop.spec | 14 +++++++---- 4 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 htop-script-python3.patch diff --git a/htop-desktop-file-fix-thoenig-01.patch b/htop-desktop-file-fix-thoenig-01.patch index 076669e..0634773 100644 --- a/htop-desktop-file-fix-thoenig-01.patch +++ b/htop-desktop-file-fix-thoenig-01.patch @@ -3,15 +3,11 @@ From: boombatower Date: Thu, 11 Feb 2016 12:36:06 -0600 Subject: [PATCH] Improve desktop file category. ---- - htop.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: htop.desktop +Index: htop-2.1.0/htop.desktop =================================================================== ---- htop.desktop.orig -+++ htop.desktop -@@ -33,7 +33,7 @@ +--- 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 @@ -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]=行程檢視器 diff --git a/htop-script-python3.patch b/htop-script-python3.patch new file mode 100644 index 0000000..e890deb --- /dev/null +++ b/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 diff --git a/htop.changes b/htop.changes index 19f462d..0c78ee9 100644 --- a/htop.changes +++ b/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: - * Compile-time option to disable setuid - * Delay accounting metrics +- 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 - * Performance improvements in battery meter - * Update process TTY device - * Add support for sorting TASK_IDLE - * Add upper-bound to running process counter - * Bugfix: avoid crash when battery is removed - * DragonFlyBSD support -- cleanup with spec-cleaner -- rebase htop-desktop-file-fix-thoenig-01.patch -- use https + (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 diff --git a/htop.spec b/htop.spec index eef0458..a8aae3a 100644 --- a/htop.spec +++ b/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: python2-base +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 @@ -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 From 81f78773393b50b3d9f72f793271426efd21801533380625fddd7e1acbf86968 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 6 Feb 2018 13:44:01 +0000 Subject: [PATCH 3/3] - Small cleanup with spec-clener OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=46 --- htop.changes | 5 +++++ htop.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/htop.changes b/htop.changes index 0c78ee9..e983cc7 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/htop.spec b/htop.spec index a8aae3a..c2c01ab 100644 --- a/htop.spec +++ b/htop.spec @@ -36,7 +36,6 @@ 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