From d95773fc0552f8c04220172209537565bc2a91e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 04:26:45 +0000 Subject: [PATCH 1/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 0313294..25fbaab 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -56,6 +56,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ef2f8727c4dedc8eae102317554c11f6aac7770e Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 4 Feb 2020 17:26:30 -0500 Subject: [PATCH 2/7] Add patch to build against gcc-10 --- htop-gcc10.patch | 27 +++++++++++++++++++++++++++ htop.spec | 6 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 htop-gcc10.patch diff --git a/htop-gcc10.patch b/htop-gcc10.patch new file mode 100644 index 0000000..98cb8dc --- /dev/null +++ b/htop-gcc10.patch @@ -0,0 +1,27 @@ +--- 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 25fbaab..198185f 100644 --- a/htop.spec +++ b/htop.spec @@ -1,10 +1,11 @@ Name: htop Version: 2.2.0 -Release: 7%{?dist} +Release: 8%{?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 BuildRequires: desktop-file-utils BuildRequires: ncurses-devel @@ -56,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Tue Feb 04 2020 Mukundan Ragavan - 2.2.0-8 +- Add patch to build against gcc-10 + * Wed Jan 29 2020 Fedora Release Engineering - 2.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e6ba1bc6d40cdb871acae288e2f8aca248223a3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:00:24 +0000 Subject: [PATCH 3/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 198185f..bfc7b64 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Feb 04 2020 Mukundan Ragavan - 2.2.0-8 - Add patch to build against gcc-10 From f3f3971c02a32f8f33def9eb6c92ab0782e21e9c Mon Sep 17 00:00:00 2001 From: Jozef Mlich Date: Tue, 1 Sep 2020 10:45:57 +0200 Subject: [PATCH 4/7] update htop to 3.0.0 see release notes at https://www.freelists.org/post/htop/htop300-released --- htop-gcc10.patch | 27 --------------------------- htop.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 htop-gcc10.patch 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 From c12ede6c9010e5d443d76459a703cfdb88e091d5 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 3 Sep 2020 22:02:28 -0400 Subject: [PATCH 5/7] Update to 3.0.1 --- .gitignore | 1 + htop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 23a555c..becfd16 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ htop-0.8.3.tar.gz /htop-2.0.2.tar.gz /htop-2.1.0.tar.gz /htop-2.2.0.tar.gz +/htop-3.0.1.tar.gz diff --git a/htop.spec b/htop.spec index 6e6dab6..319b40c 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Summary: Interactive process viewer License: GPLv2+ @@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Thu Sep 03 2020 Mukundan Ragavan - 3.0.1-1 +- Update to 3.0.1 + * Tue Sep 01 2020 Jozef Mlich - 3.0.0-1 - see release notes at https://www.freelists.org/post/htop/htop300-released diff --git a/sources b/sources index c1ec2ea..5d3e4e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (htop-3.0.0.tar.gz) = 36dc37b416b9917005007448fe73fdd6475a3f7f8442a083923d3f5dfb706d0f1731255522a99b67cc547b239acb1c68b144f8d600e243eeba160b2a43e8339a +SHA512 (htop-3.0.1.tar.gz) = 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945 From 1b63bf3058bd8f859f23635ce09ff781e0267341 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 22 Sep 2020 18:09:46 -0400 Subject: [PATCH 6/7] Update to 3.0.2 --- .gitignore | 1 + htop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index becfd16..319f4c3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ htop-0.8.3.tar.gz /htop-2.1.0.tar.gz /htop-2.2.0.tar.gz /htop-3.0.1.tar.gz +/htop-3.0.2.tar.gz diff --git a/htop.spec b/htop.spec index 319b40c..da5ff0d 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} Summary: Interactive process viewer License: GPLv2+ @@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Tue Sep 22 2020 Mukundan Ragavan - 3.0.2-1 +- Update to 3.0.2 + * Thu Sep 03 2020 Mukundan Ragavan - 3.0.1-1 - Update to 3.0.1 diff --git a/sources b/sources index 5d3e4e9..2e15745 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (htop-3.0.1.tar.gz) = 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945 +SHA512 (htop-3.0.2.tar.gz) = 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868 From 72519a1ae37ad26e05b8db497e835108d583770f Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 8 Dec 2020 20:02:58 -0500 Subject: [PATCH 7/7] Update to 3.0.3 --- .gitignore | 1 + htop.spec | 11 +++++------ sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 319f4c3..8c8e8d7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ htop-0.8.3.tar.gz /htop-2.2.0.tar.gz /htop-3.0.1.tar.gz /htop-3.0.2.tar.gz +/htop-3.0.3.tar.gz diff --git a/htop.spec b/htop.spec index da5ff0d..2c6e4fe 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} Summary: Interactive process viewer License: GPLv2+ @@ -26,11 +26,6 @@ top(1). pathfix.py -pni "/usr/libexec/platform-python" scripts/ %endif -# fix parsing -s on the command line -# https://github.com/hishamhm/htop/pull/790/commits/9d03d6178c23e6ebd5dd67339466e0a7e0d1d1a8 -# RH bz#1666551 -sed -i 's/hvCst:/hvCts/' htop.c - %build autoreconf -vfi @@ -53,10 +48,14 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %license COPYING %{_bindir}/htop %{_datadir}/pixmaps/htop.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Tue Dec 08 2020 Mukundan Ragavan - 3.0.3-1 +- Update to 3.0.3 + * Tue Sep 22 2020 Mukundan Ragavan - 3.0.2-1 - Update to 3.0.2 diff --git a/sources b/sources index 2e15745..db7372c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (htop-3.0.2.tar.gz) = 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868 +SHA512 (htop-3.0.3.tar.gz) = 208eff95a0df3ab38f5e3175bb34420c8833ad630c797825a3fb188a1111476a3287aa5f53511c83da90d181afc3e6ea246ea01fbc3227466c5c928a5d70badc