pool/htop
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 595963 from Base:System

Browse Source 
- Simplify spec file
  * Drop support for building on older distros
  * Trim describtion
- Enable delayacct

- 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/595963
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/htop?expand=0&rev=43
This commit is contained in:
Yuchen Lin 2018-04-13 10:51:07 +00:00 committed by Git OBS Bridge
commit a47f794583
7 changed files with 70 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htop-2.1.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748
size 302938

17
htop-2.1.0.tar.gz.asc
View File

@ -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-----

3
htop-2.2.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57
size 308109

17
htop-2.2.0.tar.gz.asc Normal file
View File

@ -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-----

16
htop-script-python3.patch
View File

@ -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

30
htop.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Thu Apr 12 12:09:09 UTC 2018 - mpluskal@suse.com
- Simplify spec file
* Drop support for building on older distros
* Trim describtion
- Enable delayacct
-------------------------------------------------------------------
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

44
htop.spec
View File

@ -17,36 +17,33 @@
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
Patch0: htop-desktop-file-fix-thoenig-01.patch
# PATCH-FIX-OPENSUSE htop-script-python3.patch
Patch1: htop-script-python3.patch
BuildRequires: ncurses-devel
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: python3-base
BuildRequires: update-desktop-files
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libnl-genl-3.0)
BuildRequires: pkgconfig(ncurses)
Recommends: lsof
Recommends: strace
%description
htop is an interactive text-mode process viewer for Linux. It aims to
be a better 'top' and requires ncurses. It is tested with Linux 2.6,
but is also reported to work (and was originally developed) with the
2.4 series.
htop is an interactive text-mode process viewer for Linux. It aims to be a
better 'top' and requires ncurses.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%autosetup -p1
%build
%configure \
@ -54,32 +51,19 @@ but is also reported to work (and was originally developed) with the
--enable-unicode \
--enable-linux-affinity \
--enable-taskstats \
--enable-delayacct \
--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} < 1500
LIBS="-lncursesw -ltinfo -lm " make -e %{?_smp_mflags}
%else
make %{?_smp_mflags}
%endif
%make_build
%install
%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
%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