From e77e14708ff5f97a5dcbae1b9ad2636aab82f4c81e7816ac7ff6a52ffccfddbb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Jul 2016 11:11:19 +0000 Subject: [PATCH] Accepting request 414579 from home:pluskalm:branches:Base:System - Update to version 2.0.2: OBS-URL: https://build.opensuse.org/request/show/414579 OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=38 --- htop-2.0.1-fix-escdelay-usage.patch | 37 -------------------------- htop-2.0.1.tar.gz | 3 --- htop-2.0.2.tar.gz | 3 +++ htop-desktop-file-fix-thoenig-01.patch | 17 +++++++----- htop.changes | 18 +++++++++++++ htop.spec | 16 ++++------- 6 files changed, 36 insertions(+), 58 deletions(-) delete mode 100644 htop-2.0.1-fix-escdelay-usage.patch delete mode 100644 htop-2.0.1.tar.gz create mode 100644 htop-2.0.2.tar.gz diff --git a/htop-2.0.1-fix-escdelay-usage.patch b/htop-2.0.1-fix-escdelay-usage.patch deleted file mode 100644 index 761fd3f..0000000 --- a/htop-2.0.1-fix-escdelay-usage.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 645057d81aa619f4f9704cd221e63b357ac7f749 Mon Sep 17 00:00:00 2001 -From: Hisham -Date: Thu, 19 May 2016 16:09:47 -0300 -Subject: [PATCH] Use set_escdelay() to avoid problems with ESCDELAY as a - macro. - ---- - InfoScreen.c | 2 +- - ScreenManager.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/InfoScreen.c b/InfoScreen.c -index a6dd55a..085b860 100644 ---- a/InfoScreen.c -+++ b/InfoScreen.c -@@ -116,7 +116,7 @@ void InfoScreen_run(InfoScreen* this) { - - if (this->inc->active) - move(LINES-1, CRT_cursorX); -- ESCDELAY = 25; -+ set_escdelay(25); - int ch = getch(); - - if (ch == ERR) { -diff --git a/ScreenManager.c b/ScreenManager.c -index db3fdee..44e74e0 100644 ---- a/ScreenManager.c -+++ b/ScreenManager.c -@@ -189,7 +189,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { - } - - int prevCh = ch; -- ESCDELAY = 25; -+ set_escdelay(25); - ch = getch(); - - HandlerResult result = IGNORED; diff --git a/htop-2.0.1.tar.gz b/htop-2.0.1.tar.gz deleted file mode 100644 index d5cbd47..0000000 --- a/htop-2.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666 -size 477196 diff --git a/htop-2.0.2.tar.gz b/htop-2.0.2.tar.gz new file mode 100644 index 0000000..dfb4827 --- /dev/null +++ b/htop-2.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487 +size 476364 diff --git a/htop-desktop-file-fix-thoenig-01.patch b/htop-desktop-file-fix-thoenig-01.patch index d1f9e9e..cf86246 100644 --- a/htop-desktop-file-fix-thoenig-01.patch +++ b/htop-desktop-file-fix-thoenig-01.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Improve desktop file category. htop.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/htop.desktop b/htop.desktop -index 2f7a7ee..96d2946 100644 ---- a/htop.desktop -+++ b/htop.desktop +Index: htop.desktop +=================================================================== +--- htop.desktop.orig ++++ htop.desktop @@ -32,7 +32,7 @@ Comment[zh_TW]=顯示系統行程 Terminal=true Exec=htop @@ -20,6 +20,9 @@ index 2f7a7ee..96d2946 100644 GenericName=Process Viewer GenericName[ca]=Visor de processos GenericName[de]=Prozessanzeige --- -2.7.0 - +@@ -60,4 +60,4 @@ GenericName[sv]=Processvisning + GenericName[tr]=Süreç Görüntüleyici + GenericName[uk]=Перегляд процесів + GenericName[zh_TW]=行程檢視器 +-Keywords=system;process;task ++Keywords=system;process;task; diff --git a/htop.changes b/htop.changes index ee9aa8a..dcc5db4 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Jul 23 08:06:45 UTC 2016 - mpluskal@suse.com + +- Update to version 2.0.2: + * Mac OS X: stop trying when task_for_pid fails for a process, + stops spamming logs with errors. + * Add Ctrl+A and Ctrl+E to go to beginning and end of line + * FreeBSD: fixes for CPU calculation + * Usability: auto-follow process after a search. + * Use Linux backend on GNU Hurd + * Improvement for reproducible builds. + * BUGFIX: Fix behavior of Alt-key combinations + * Various code tweaks and cleanups +- Drop htop-2.0.1-fix-escdelay-usage.patch +- Update htop-desktop-file-fix-thoenig-01.patch +- Drop some build dependencies +- Enable taskstats + ------------------------------------------------------------------- Sun May 22 15:23:24 UTC 2016 - develop7@develop7.info diff --git a/htop.spec b/htop.spec index a88646d..8c2361c 100644 --- a/htop.spec +++ b/htop.spec @@ -17,7 +17,7 @@ Name: htop -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: An Interactive text-mode Process Viewer for Linux License: GPL-2.0+ @@ -25,14 +25,9 @@ Group: System/Monitoring Url: http://hisham.hm/htop Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz Patch0: htop-desktop-file-fix-thoenig-01.patch -Patch1: htop-2.0.1-fix-escdelay-usage.patch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool BuildRequires: ncurses-devel -BuildRequires: python BuildRequires: update-desktop-files -Requires(post): update-desktop-files +Requires(post): update-desktop-files Requires(postun): update-desktop-files Recommends: lsof Recommends: strace @@ -46,15 +41,14 @@ but is also reported to work (and was originally developed) with the %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 %build -autoreconf -fiv %configure \ --enable-taskstats \ --enable-unicode \ --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. @@ -65,7 +59,7 @@ make -e %{?_smp_mflags} %endif %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %suse_update_desktop_file -i %{name} System Monitor %post