diff --git a/htop-gcc10.patch b/htop-gcc10.patch deleted file mode 100644 index 98cb8dc..0000000 --- a/htop-gcc10.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- CRT.h.orig 2020-02-04 17:18:44.505493387 -0500 -+++ CRT.h 2020-02-04 17:19:33.112820135 -0500 -@@ -140,7 +140,7 @@ - - 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_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.spec b/htop.spec index bfc7b64..6e6dab6 100644 --- a/htop.spec +++ b/htop.spec @@ -1,11 +1,10 @@ Name: htop -Version: 2.2.0 -Release: 9%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ -Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-gcc10.patch +Source0: https://github.com/htop-dev/htop/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: ncurses-devel @@ -23,7 +22,6 @@ top(1). %prep %autosetup -sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in %if 0%{?rhel} >= 8 pathfix.py -pni "/usr/libexec/platform-python" scripts/ %endif @@ -34,6 +32,8 @@ pathfix.py -pni "/usr/libexec/platform-python" scripts/ sed -i 's/hvCst:/hvCts/' htop.c %build +autoreconf -vfi + %configure \ --enable-openvz \ --enable-vserver \ @@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Tue Sep 01 2020 Jozef Mlich - 3.0.0-1 +- see release notes at https://www.freelists.org/post/htop/htop300-released + * Tue Jul 28 2020 Fedora Release Engineering - 2.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 33c9564..c1ec2ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (htop-2.2.0.tar.gz) = ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e +SHA512 (htop-3.0.0.tar.gz) = 36dc37b416b9917005007448fe73fdd6475a3f7f8442a083923d3f5dfb706d0f1731255522a99b67cc547b239acb1c68b144f8d600e243eeba160b2a43e8339a