From ec0658c0d380257ae6936ec5cf90ca42f32528911478330c300ed93dc5287307 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 11 Apr 2018 10:54:10 +0000 Subject: [PATCH] Accepting request 595378 from home:avindra:branches:Base:System - Update to version 2.2.0 * -t/--tree flag for starting in tree-view mode * Various automake and build improvements * Check for pkg-config when building with --enable-delayacct * Avoid some bashisms in configure script * Use CFLAGS from ncurses*-config if present * Header generator supports non-UTF-8 environments * Changed detection of kernel threads * Collapse current subtree pressing Backspace * BUGFIX: fix behavior of SYSCR column * BUGFIX: obtain exit code of lsof correctly * BUGFIX: fix crash with particular keycodes * BUGFIX: fix issue with small terminals * BUGFIX: fix terminal color issues * BUGFIX: preserve LDFLAGS when building * BUGFIX: fixed overflow for systems with >= 100 signals - cleanup with spec-cleaner - rebase htop-script-python3.patch OBS-URL: https://build.opensuse.org/request/show/595378 OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=48 --- htop-2.1.0.tar.gz | 3 --- htop-2.1.0.tar.gz.asc | 17 ----------------- htop-2.2.0.tar.gz | 3 +++ htop-2.2.0.tar.gz.asc | 17 +++++++++++++++++ htop-script-python3.patch | 16 ++++++---------- htop.changes | 22 ++++++++++++++++++++++ htop.spec | 10 +++++----- 7 files changed, 53 insertions(+), 35 deletions(-) delete mode 100644 htop-2.1.0.tar.gz delete mode 100644 htop-2.1.0.tar.gz.asc create mode 100644 htop-2.2.0.tar.gz create mode 100644 htop-2.2.0.tar.gz.asc diff --git a/htop-2.1.0.tar.gz b/htop-2.1.0.tar.gz deleted file mode 100644 index 2152150..0000000 --- a/htop-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 5dc8398..0000000 --- a/htop-2.1.0.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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-2.2.0.tar.gz b/htop-2.2.0.tar.gz new file mode 100644 index 0000000..38fc620 --- /dev/null +++ b/htop-2.2.0.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..fd97b8d --- /dev/null +++ b/htop-2.2.0.tar.gz.asc @@ -0,0 +1,17 @@ +-----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-script-python3.patch b/htop-script-python3.patch index e890deb..2e9737e 100644 --- a/htop-script-python3.patch +++ b/htop-script-python3.patch @@ -1,7 +1,5 @@ -Index: htop-2.1.0/Makefile.in -=================================================================== ---- htop-2.1.0.orig/Makefile.in -+++ htop-2.1.0/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -2388,7 +2388,7 @@ coverage: $(MAKE) all CFLAGS="" AM_CPPFLAGS="-fprofile-arcs -ftest-coverage -DDEBUG" LDFLAGS="-lgcov" @@ -11,13 +9,11 @@ Index: htop-2.1.0/Makefile.in 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 +--- a/scripts/MakeHeader.py ++++ b/scripts/MakeHeader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - import os, sys, string + import os, sys, string, io try: - from cStringIO import StringIO + from StringIO import StringIO diff --git a/htop.changes b/htop.changes index b846515..872009b 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Apr 10 22:48:06 UTC 2018 - avindra@opensuse.org + +- Update to version 2.2.0 + * -t/--tree flag for starting in tree-view mode + * Various automake and build improvements + * Check for pkg-config when building with --enable-delayacct + * Avoid some bashisms in configure script + * Use CFLAGS from ncurses*-config if present + * Header generator supports non-UTF-8 environments + * Changed detection of kernel threads + * Collapse current subtree pressing Backspace + * BUGFIX: fix behavior of SYSCR column + * BUGFIX: obtain exit code of lsof correctly + * BUGFIX: fix crash with particular keycodes + * BUGFIX: fix issue with small terminals + * BUGFIX: fix terminal color issues + * BUGFIX: preserve LDFLAGS when building + * BUGFIX: fixed overflow for systems with >= 100 signals +- cleanup with spec-cleaner +- rebase htop-script-python3.patch + ------------------------------------------------------------------- Fri Feb 23 11:08:31 UTC 2018 - ecsos@opensuse.org diff --git a/htop.spec b/htop.spec index ca10036..188d6fd 100644 --- a/htop.spec +++ b/htop.spec @@ -17,12 +17,12 @@ Name: htop -Version: 2.1.0 +Version: 2.2.0 Release: 0 Summary: An Interactive text-mode Process Viewer for Linux -License: GPL-2.0+ +License: GPL-2.0-or-later 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 @@ -76,10 +76,10 @@ make %{?_smp_mflags} %endif %files -%doc COPYING +%license COPYING %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_mandir}/man1/%{name}.1%{ext_man} +%{_mandir}/man1/%{name}.1%{?ext_man} %changelog