From a061cbdbc96975dabf05f9bbd0230a73139098ec Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Fri, 11 Nov 2005 17:12:07 +0000 Subject: [PATCH 01/63] auto-import htop-0.5.4-2 on branch devel from htop-0.5.4-2.src.rpm --- .cvsignore | 1 + htop.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 52 insertions(+) create mode 100644 htop.spec diff --git a/.cvsignore b/.cvsignore index e69de29..dbfe5c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +htop-0.5.4.tar.gz diff --git a/htop.spec b/htop.spec new file mode 100644 index 0000000..c9ff976 --- /dev/null +++ b/htop.spec @@ -0,0 +1,50 @@ +Name: htop +Version: 0.5.4 +Release: 2%{?dist} +Summary: Interactive process viewer + +Group: Applications/System +License: GPL +URL: http://htop.sourceforge.net/ +Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: ncurses-devel + +%description +htop is an interactive text-mode process viewer for Linux, similar to +top(1). + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc COPYING ChangeLog README TODO +%{_bindir}/htop +%{_mandir}/man1/htop.1* + + +%changelog +* Fri Nov 11 2005 Dawid Gajownik - 0.5.4-2 +- Don't use superflous CFLAGS variable (Dmitry Butskoy) +- Don't include AUTHORS and NEWS files + +* Thu Nov 10 2005 Dawid Gajownik - 0.5.4-1 +- Initial RPM release. diff --git a/sources b/sources index e69de29..eebac7b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9bd650ea78418227b9661a58889a4c2a htop-0.5.4.tar.gz From 6f585470219e1cfa41594442e954286b309d9b15 Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Wed, 28 Dec 2005 20:00:37 +0000 Subject: [PATCH 02/63] Update to version 0.6. --- .cvsignore | 2 +- htop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index dbfe5c4..0ff6b2b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.5.4.tar.gz +htop-0.6.tar.gz diff --git a/htop.spec b/htop.spec index c9ff976..80f5291 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.5.4 -Release: 2%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Wed Dec 28 2005 Dawid Gajownik - 0.6-1 +- Version 0.6 + * Fri Nov 11 2005 Dawid Gajownik - 0.5.4-2 - Don't use superflous CFLAGS variable (Dmitry Butskoy) - Don't include AUTHORS and NEWS files diff --git a/sources b/sources index eebac7b..bb5241c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bd650ea78418227b9661a58889a4c2a htop-0.5.4.tar.gz +f4aeafa0111805a92d4d2ead907bc8e5 htop-0.6.tar.gz From 0ee8947e7fe39d476b89c22ea1f29eea5448eaec Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Wed, 28 Dec 2005 22:28:28 +0000 Subject: [PATCH 03/63] Upstream updated tarball with a small bug fix without increasing release number. We'll need to rebuild it once again. Lesson for today: don't try to be faster than the light ;) --- htop.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htop.spec b/htop.spec index 80f5291..3430f3e 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Wed Dec 28 2005 Dawid Gajownik - 0.6-2 +- Rebuild with updated tarball + * Wed Dec 28 2005 Dawid Gajownik - 0.6-1 - Version 0.6 diff --git a/sources b/sources index bb5241c..4683ea0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4aeafa0111805a92d4d2ead907bc8e5 htop-0.6.tar.gz +c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz From 2fc3b8448e4593f99a501098f5c44a1e3b8970dd Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Tue, 14 Feb 2006 09:58:11 +0000 Subject: [PATCH 04/63] Rebuild for Fedora Extras 5 --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 3430f3e..ff78a88 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -42,6 +42,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 14 2006 Dawid Gajownik - 0.6-3 +- Rebuild for Fedora Extras 5 + * Wed Dec 28 2005 Dawid Gajownik - 0.6-2 - Rebuild with updated tarball From a869877e09dd6a687959d1e76a755c222e8ca508 Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Wed, 10 May 2006 14:40:27 +0000 Subject: [PATCH 05/63] Update to 0.6.1 --- .cvsignore | 2 +- htop.spec | 19 ++++++++++++++++--- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0ff6b2b..5cc8e35 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.6.tar.gz +htop-0.6.1.tar.gz diff --git a/htop.spec b/htop.spec index ff78a88..dc64fdd 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.6 -Release: 3%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -29,6 +29,14 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} +desktop-file-install \ + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop + %clean rm -rf %{buildroot} @@ -36,12 +44,17 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc COPYING ChangeLog README %{_bindir}/htop +%{_datadir}/applications/*htop.desktop +%{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +- Update to 0.6.1 + * Tue Feb 14 2006 Dawid Gajownik - 0.6-3 - Rebuild for Fedora Extras 5 diff --git a/sources b/sources index 4683ea0..ab4fcd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c00b1dba101569a055ed260e06a25596 htop-0.6.tar.gz +f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz From 66e7f2a11dfc3e2e4b54b478a9e652057b3c6d59 Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Wed, 10 May 2006 15:03:57 +0000 Subject: [PATCH 06/63] Add missing BR: desktop-file-utils --- htop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index dc64fdd..2ce5635 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,6 +9,7 @@ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils BuildRequires: ncurses-devel %description @@ -52,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +- Add missing BR: desktop-file-utils + * Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 From ce6366df979ccdb2031febc4bc089d52cc2aa350 Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Sat, 20 May 2006 10:53:23 +0000 Subject: [PATCH 07/63] Update to 0.6.2 --- .cvsignore | 2 +- htop.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5cc8e35..e1532a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.6.1.tar.gz +htop-0.6.2.tar.gz diff --git a/htop.spec b/htop.spec index 2ce5635..45a079d 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -22,7 +22,8 @@ top(1). %build -%configure +%configure \ + --disable-dependency-tracking make %{?_smp_mflags} @@ -53,6 +54,9 @@ rm -rf %{buildroot} %changelog +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +- Update to 0.6.2 + * Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils diff --git a/sources b/sources index ab4fcd0..d75ad1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f369aa17d4e28d0959080966687152e2 htop-0.6.1.tar.gz +995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz From ca62ce98bdac97fe8987ea072f464def93ab334d Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Sun, 30 Jul 2006 16:13:31 +0000 Subject: [PATCH 08/63] - Update to 0.6.3 - Correct e-mail address in ChangeLog - Replace tabs with spaces --- .cvsignore | 2 +- htop.spec | 39 ++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.cvsignore b/.cvsignore index e1532a9..03086f2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.6.2.tar.gz +htop-0.6.3.tar.gz diff --git a/htop.spec b/htop.spec index 45a079d..28b3199 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} Summary: Interactive process viewer @@ -23,7 +23,7 @@ top(1). %build %configure \ - --disable-dependency-tracking + --disable-dependency-tracking make %{?_smp_mflags} @@ -32,12 +32,12 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --vendor fedora \ - --add-category X-Fedora \ - --add-category Application \ - --delete-original \ - %{buildroot}%{_datadir}/applications/htop.desktop + --dir %{buildroot}%{_datadir}/applications \ + --vendor fedora \ + --add-category X-Fedora \ + --add-category Application \ + --delete-original \ + %{buildroot}%{_datadir}/applications/htop.desktop %clean @@ -46,7 +46,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README +%doc COPYING ChangeLog README TODO %{_bindir}/htop %{_datadir}/applications/*htop.desktop %{_datadir}/pixmaps/htop.png @@ -54,27 +54,32 @@ rm -rf %{buildroot} %changelog -* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 +* Sun Jul 30 2006 Dawid Gajownik - 0.6.3-1 +- Update to 0.6.3 +- Correct e-mail address in ChangeLog +- Replace tabs with spaces + +* Sat May 20 2006 Dawid Gajownik - 0.6.2-1 - Update to 0.6.2 -* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 +* Wed May 10 2006 Dawid Gajownik - 0.6.1-2 - Add missing BR: desktop-file-utils -* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 +* Wed May 10 2006 Dawid Gajownik - 0.6.1-1 - Update to 0.6.1 -* Tue Feb 14 2006 Dawid Gajownik - 0.6-3 +* Tue Feb 14 2006 Dawid Gajownik - 0.6-3 - Rebuild for Fedora Extras 5 -* Wed Dec 28 2005 Dawid Gajownik - 0.6-2 +* Wed Dec 28 2005 Dawid Gajownik - 0.6-2 - Rebuild with updated tarball -* Wed Dec 28 2005 Dawid Gajownik - 0.6-1 +* Wed Dec 28 2005 Dawid Gajownik - 0.6-1 - Version 0.6 -* Fri Nov 11 2005 Dawid Gajownik - 0.5.4-2 +* Fri Nov 11 2005 Dawid Gajownik - 0.5.4-2 - Don't use superflous CFLAGS variable (Dmitry Butskoy) - Don't include AUTHORS and NEWS files -* Thu Nov 10 2005 Dawid Gajownik - 0.5.4-1 +* Thu Nov 10 2005 Dawid Gajownik - 0.5.4-1 - Initial RPM release. diff --git a/sources b/sources index d75ad1b..21ebfe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -995e76b7fd18c05fb7fb5ef10a2166ca htop-0.6.2.tar.gz +51255f2b3632888e7de511a5a47dd785 htop-0.6.3.tar.gz From afaabfc770506dbbfebf749d0a906d93167b562b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:30:54 +0000 Subject: [PATCH 09/63] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 222dbaba671d4c5142b245ce28767587bdfc4f9d Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Sat, 16 Sep 2006 18:19:53 +0000 Subject: [PATCH 10/63] Rebuild for FE6 --- htop.spec | 5 ++++- needs.rebuild | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 needs.rebuild diff --git a/htop.spec b/htop.spec index 28b3199..efc78ea 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -54,6 +54,9 @@ rm -rf %{buildroot} %changelog +* Sat Sep 16 2006 Dawid Gajownik - 0.6.3-2 +- Rebuild for FE6 + * Sun Jul 30 2006 Dawid Gajownik - 0.6.3-1 - Update to 0.6.3 - Correct e-mail address in ChangeLog diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 40fd84dba2a16e9b62b377685476d641370ddec0 Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Wed, 4 Oct 2006 21:05:29 +0000 Subject: [PATCH 11/63] Update to 0.6.4 --- .cvsignore | 2 +- htop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 03086f2..5bf133f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.6.3.tar.gz +htop-0.6.4.tar.gz diff --git a/htop.spec b/htop.spec index efc78ea..f64c8c6 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.6.3 -Release: 2%{?dist} +Version: 0.6.4 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -54,6 +54,9 @@ rm -rf %{buildroot} %changelog +* Wed Oct 4 2006 Dawid Gajownik - 0.6.4-1 +- Update to 0.6.4 + * Sat Sep 16 2006 Dawid Gajownik - 0.6.3-2 - Rebuild for FE6 diff --git a/sources b/sources index 21ebfe6..a5ac539 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51255f2b3632888e7de511a5a47dd785 htop-0.6.3.tar.gz +989905bb2559cf6404c1b8e8ffa48b15 htop-0.6.4.tar.gz From 60617eae8067951785af2fcdb2d40cf5af671376 Mon Sep 17 00:00:00 2001 From: Dawid Gajownik Date: Sat, 16 Dec 2006 20:09:25 +0000 Subject: [PATCH 12/63] Update to 0.6.5 --- .cvsignore | 2 +- htop.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5bf133f..0397a88 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.6.4.tar.gz +htop-0.6.5.tar.gz diff --git a/htop.spec b/htop.spec index f64c8c6..ccaf5b2 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: Interactive process viewer @@ -34,8 +34,6 @@ make install DESTDIR=%{buildroot} desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ --vendor fedora \ - --add-category X-Fedora \ - --add-category Application \ --delete-original \ %{buildroot}%{_datadir}/applications/htop.desktop @@ -54,6 +52,9 @@ rm -rf %{buildroot} %changelog +* Sat Dec 9 2006 Dawid Gajownik - 0.6.5-1 +- Update to 0.6.5 + * Wed Oct 4 2006 Dawid Gajownik - 0.6.4-1 - Update to 0.6.4 diff --git a/sources b/sources index a5ac539..fcf71c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -989905bb2559cf6404c1b8e8ffa48b15 htop-0.6.4.tar.gz +180aa7c9db7106ed1197b1e408660a0e htop-0.6.5.tar.gz From 769c570b2196b9a296d3ba5af376894837e4420d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Mon, 11 Feb 2008 21:54:14 +0000 Subject: [PATCH 13/63] update to 0.7 --- .cvsignore | 2 +- htop.spec | 27 +++++++++++++++------------ sources | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0397a88..894f25a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.6.5.tar.gz +htop-0.7.tar.gz diff --git a/htop.spec b/htop.spec index ccaf5b2..ddb1d71 100644 --- a/htop.spec +++ b/htop.spec @@ -1,10 +1,10 @@ Name: htop -Version: 0.6.5 +Version: 0.7 Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System -License: GPL +License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,39 +19,42 @@ top(1). %prep %setup -q - +sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in +sed -i -e '2,3d' -e '7d' htop.desktop %build -%configure \ - --disable-dependency-tracking +%configure make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - %{buildroot}%{_datadir}/applications/htop.desktop + --remove-category=Applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README TODO %{_bindir}/htop -%{_datadir}/applications/*htop.desktop +%{_datadir}/applications/fedora-htop.desktop %{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Mon Feb 11 2008 Rafał Psota - 0.7-1 +- update to 0.7 * Sat Dec 9 2006 Dawid Gajownik - 0.6.5-1 - Update to 0.6.5 diff --git a/sources b/sources index fcf71c6..8afe3fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -180aa7c9db7106ed1197b1e408660a0e htop-0.6.5.tar.gz +4afc961fa709167e1b434682897991f9 htop-0.7.tar.gz From f3bf48072fa9f52972ad364d9a5dc3379c6e7852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Sun, 27 Apr 2008 12:20:40 +0000 Subject: [PATCH 14/63] desktop file fix (bug #444280) --- htop.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/htop.spec b/htop.spec index ddb1d71..92427d1 100644 --- a/htop.spec +++ b/htop.spec @@ -1,7 +1,8 @@ Name: htop Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer +Summary(pl): Interaktywna przeglądarka procesów Group: Applications/System License: GPL+ @@ -16,11 +17,15 @@ BuildRequires: ncurses-devel htop is an interactive text-mode process viewer for Linux, similar to top(1). +%description -l pl +htop to interaktywna tekstowa przeglądarka procesów dla Linuksa podobna +do top(1). + %prep %setup -q sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in -sed -i -e '2,3d' -e '7d' htop.desktop +sed -i -e '2,3d' -e '9d' htop.desktop %build %configure @@ -53,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 27 2008 Rafał Psota - 0.7-2 +- desktop file fix * Mon Feb 11 2008 Rafał Psota - 0.7-1 - update to 0.7 * Sat Dec 9 2006 Dawid Gajownik - 0.6.5-1 From 3c03068abb3833cc311fff7f94df520b6f3cfbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Thu, 31 Jul 2008 14:50:11 +0000 Subject: [PATCH 15/63] update to 0.8 --- .cvsignore | 2 +- htop.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 894f25a..5b2fbe9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.7.tar.gz +htop-0.8.tar.gz diff --git a/htop.spec b/htop.spec index 92427d1..137a356 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.7 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -40,9 +40,12 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - --remove-category=Applications \ + --remove-category=Application \ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop +#remove empty direcories +rm -rf $RPM_BUILD_ROOT%{prefix}/lib +rm -rf $RPM_BUILD_ROOT%{prefix}/include %clean rm -rf $RPM_BUILD_ROOT @@ -58,6 +61,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 31 2008 Rafał Psota - 0.8-1 +- udate to 0.8 * Sun Apr 27 2008 Rafał Psota - 0.7-2 - desktop file fix * Mon Feb 11 2008 Rafał Psota - 0.7-1 diff --git a/sources b/sources index 8afe3fd..8ef822a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4afc961fa709167e1b434682897991f9 htop-0.7.tar.gz +b6955f8d75cdb5a3ccea83415cb18815 htop-0.8.tar.gz From a76835f527fa981bdc39178ab2062b18c21313a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Tue, 14 Oct 2008 18:34:23 +0000 Subject: [PATCH 16/63] update to 0.8.1 --- .cvsignore | 2 +- htop.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5b2fbe9..d06252c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.8.tar.gz +htop-0.8.1.tar.gz diff --git a/htop.spec b/htop.spec index 137a356..e8c68b4 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 0.8 +Version: 0.8.1 Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -61,6 +61,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 14 2008 Rafał Psota - 0.8.1-1 +- update to 0.8.1 * Thu Jul 31 2008 Rafał Psota - 0.8-1 - udate to 0.8 * Sun Apr 27 2008 Rafał Psota - 0.7-2 diff --git a/sources b/sources index 8ef822a..183beb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6955f8d75cdb5a3ccea83415cb18815 htop-0.8.tar.gz +f0b259ca29175656de48bf0fa0a2e619 htop-0.8.1.tar.gz From 8413399ae90c22a33e94b0634dd0c6046f0f81e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Tue, 18 Nov 2008 11:46:55 +0000 Subject: [PATCH 17/63] non-printable character filter patch (#504144) --- htop-0.8.1-nonprint.patch | 11 +++++++++++ htop.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 htop-0.8.1-nonprint.patch diff --git a/htop-0.8.1-nonprint.patch b/htop-0.8.1-nonprint.patch new file mode 100644 index 0000000..cbebc06 --- /dev/null +++ b/htop-0.8.1-nonprint.patch @@ -0,0 +1,11 @@ +--- RichString.c.orig 2008-03-09 03:23:49.000000000 +0100 ++++ RichString.c 2008-11-18 12:30:21.000000000 +0100 +@@ -89,7 +89,7 @@ + inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) { + int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len); + for (int i = this->len, j = 0; i < last; i++, j++) +- this->chstr[i] = data_c[j] | attrs; ++ this->chstr[i] = ((data_c[j] > 31) ? data_c[j] : '?' ) | attrs; + this->chstr[last] = 0; + this->len = last; + } diff --git a/htop.spec b/htop.spec index e8c68b4..9979ec2 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -8,6 +8,7 @@ Group: Applications/System License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz +Patch0: %{name}-0.8.1-nonprint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -24,6 +25,7 @@ do top(1). %prep %setup -q +%patch0 -p0 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in sed -i -e '2,3d' -e '9d' htop.desktop @@ -40,7 +42,7 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - --remove-category=Application \ + --remove-category=Application\ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop #remove empty direcories @@ -61,6 +63,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 18 2008 Rafał Psota - 0.8.1-2 +- non-printable character filter patch (#504144) * Tue Oct 14 2008 Rafał Psota - 0.8.1-1 - update to 0.8.1 * Thu Jul 31 2008 Rafał Psota - 0.8-1 From a81d59d15356390786811fcce1076cff90756ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Tue, 18 Nov 2008 12:26:38 +0000 Subject: [PATCH 18/63] add python to BR --- htop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 9979ec2..7fd5777 100644 --- a/htop.spec +++ b/htop.spec @@ -12,7 +12,7 @@ Patch0: %{name}-0.8.1-nonprint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel, python %description htop is an interactive text-mode process viewer for Linux, similar to From 35721e6e0ea918ad44bc6808c6cf32ead1c8dde4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Thu, 5 Feb 2009 18:37:37 +0000 Subject: [PATCH 19/63] #481072 fix --- htop-0.8.1-processlist.patch | 15 +++++++++++++++ htop.spec | 12 +++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 htop-0.8.1-processlist.patch diff --git a/htop-0.8.1-processlist.patch b/htop-0.8.1-processlist.patch new file mode 100644 index 0000000..6229d63 --- /dev/null +++ b/htop-0.8.1-processlist.patch @@ -0,0 +1,15 @@ +--- ProcessList.c.orig 2008-09-23 08:23:14.000000000 +0200 ++++ ProcessList.c 2009-02-05 19:11:29.000000000 +0100 +@@ -563,9 +563,9 @@ + process->pid = pid; + } + } +- if (parent) { +- process->tgid = parent->pid; +- } ++ ++ process->tgid = parent ? parent->pid : pid; ++ + + if (showUserlandThreads && (!parent || pid != parent->pid)) { + char subdirname[MAX_NAME+1]; diff --git a/htop.spec b/htop.spec index 7fd5777..6ae3e14 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -9,6 +9,7 @@ License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz Patch0: %{name}-0.8.1-nonprint.patch +Patch1: %{name}-0.8.1-processlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -26,6 +27,7 @@ do top(1). %prep %setup -q %patch0 -p0 +%patch1 -p0 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in sed -i -e '2,3d' -e '9d' htop.desktop @@ -63,16 +65,24 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 05 2009 Rafał Psota - 0.8.1-3 +- "Tree view doesn't work with threads hidden" fixed (#481072) + * Tue Nov 18 2008 Rafał Psota - 0.8.1-2 - non-printable character filter patch (#504144) + * Tue Oct 14 2008 Rafał Psota - 0.8.1-1 - update to 0.8.1 + * Thu Jul 31 2008 Rafał Psota - 0.8-1 - udate to 0.8 + * Sun Apr 27 2008 Rafał Psota - 0.7-2 - desktop file fix + * Mon Feb 11 2008 Rafał Psota - 0.7-1 - update to 0.7 + * Sat Dec 9 2006 Dawid Gajownik - 0.6.5-1 - Update to 0.6.5 From da72257e5be4cc27e80a7b0f775a8b466ffba057 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 04:12:52 +0000 Subject: [PATCH 20/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 6ae3e14..4f54f57 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 05 2009 Rafał Psota - 0.8.1-3 - "Tree view doesn't work with threads hidden" fixed (#481072) From 16d00a627a39a870881be172b878f0afe90b3498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Tue, 2 Jun 2009 12:20:53 +0000 Subject: [PATCH 21/63] update to 0.8.2 --- .cvsignore | 2 +- htop.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index d06252c..8820616 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.8.1.tar.gz +htop-0.8.2.tar.gz diff --git a/htop.spec b/htop.spec index 4f54f57..b90103c 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.8.1 -Release: 4%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -8,8 +8,8 @@ Group: Applications/System License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz -Patch0: %{name}-0.8.1-nonprint.patch -Patch1: %{name}-0.8.1-processlist.patch +#Patch0: %{name}-0.8.1-nonprint.patch +#Patch1: %{name}-0.8.1-processlist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -26,10 +26,10 @@ do top(1). %prep %setup -q -%patch0 -p0 -%patch1 -p0 +#%patch0 -p0 +#%patch1 -p0 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in -sed -i -e '2,3d' -e '9d' htop.desktop +#sed -i -e '2,3d' -e '9d' htop.desktop %build %configure @@ -44,7 +44,6 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --delete-original \ - --remove-category=Application\ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop #remove empty direcories @@ -65,9 +64,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 02 2009 Rafał Psota - 0.8.2-1 +- update to 0.8.2 + * Tue Feb 24 2009 Fedora Release Engineering - 0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 05 2009 Rafał Psota - 0.8.1-3 - "Tree view doesn't work with threads hidden" fixed (#481072) @@ -78,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT - update to 0.8.1 * Thu Jul 31 2008 Rafał Psota - 0.8-1 -- udate to 0.8 +- update to 0.8 * Sun Apr 27 2008 Rafał Psota - 0.7-2 - desktop file fix diff --git a/sources b/sources index 183beb1..c75da9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0b259ca29175656de48bf0fa0a2e619 htop-0.8.1.tar.gz +78c2382dc4ff0cf5a29a5c3bc1e556ec htop-0.8.2.tar.gz From 1d8cee3df17f7f07bd0e0023f5ea40378fd17c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Fri, 12 Jun 2009 10:55:10 +0000 Subject: [PATCH 22/63] bz #504795 fixed --- htop-0.8.2-arrays.patch | 71 +++++++++++++++++++++++++++++++++++++++++ htop.spec | 12 ++++--- 2 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 htop-0.8.2-arrays.patch diff --git a/htop-0.8.2-arrays.patch b/htop-0.8.2-arrays.patch new file mode 100644 index 0000000..0654d8a --- /dev/null +++ b/htop-0.8.2-arrays.patch @@ -0,0 +1,71 @@ +Index: FunctionBar.c +=================================================================== +--- FunctionBar.c (revision 162) ++++ FunctionBar.c (working copy) +@@ -52,12 +52,14 @@ FunctionBar* FunctionBar_new(char** func + this->functions = malloc(sizeof(char*) * 15); + this->keys = malloc(sizeof(char*) * 15); + this->events = malloc(sizeof(int) * 15); +- int i = 0; +- while (i < 15 && functions[i]) { ++ int i; ++ for (i = 0; i < 15; i++) { ++ if (functions[i] == NULL) /* We don't know the size of the array, */ ++ break; /* so let's assume it is NULL terminated */ ++ /* and break if we find that NULL */ + this->functions[i] = String_copy(functions[i]); + this->keys[i] = String_copy(keys[i]); + this->events[i] = events[i]; +- i++; + } + this->size = i; + } else { +Index: htop.c +=================================================================== +--- htop.c (revision 162) ++++ htop.c (working copy) +@@ -151,7 +151,7 @@ static void showHelp(ProcessList* pl) { + clear(); + } + +-static char* CategoriesFunctions[10] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done "}; ++static char* CategoriesFunctions[] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done ", NULL}; + + static void Setup_run(Settings* settings, int headerHeight) { + ScreenManager* scr = ScreenManager_new(0, headerHeight, 0, -1, HORIZONTAL, true); +@@ -190,7 +190,7 @@ static HandlerResult pickWithEnter(Panel + } + + static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, char** keyLabels, FunctionBar* prevBar) { +- char* fuKeys[2] = {"Enter", "Esc"}; ++ char* fuKeys[] = {"Enter", "Esc", NULL}; + int fuEvents[2] = {13, 27}; + if (!list->eventHandler) + Panel_setEventHandler(list, pickWithEnter); +@@ -326,7 +326,7 @@ int main(int argc, char** argv) { + Panel_setRichHeader(panel, ProcessList_printHeader(pl)); + + char* searchFunctions[] = {"Next ", "Exit ", " Search: ", NULL}; +- char* searchKeys[] = {"F3", "Esc", " "}; ++ char* searchKeys[] = {"F3", "Esc", " ", NULL}; + int searchEvents[] = {KEY_F(3), 27, ERR}; + FunctionBar* searchBar = FunctionBar_new(searchFunctions, searchKeys, searchEvents); + +@@ -656,7 +656,7 @@ int main(int argc, char** argv) { + + Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr); + +- char* fuFunctions[2] = {"Set ", "Cancel "}; ++ char* fuFunctions[3] = {"Set ", "Cancel ", NULL}; + void* set = pickFromVector(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar); + if (set) { + unsigned long new = AffinityPanel_getAffinity(affinityPanel); +@@ -695,7 +695,7 @@ int main(int argc, char** argv) { + { + Panel* sortPanel = Panel_new(0, 0, 0, 0, LISTITEM_CLASS, true, ListItem_compare); + Panel_setHeader(sortPanel, "Sort by"); +- char* fuFunctions[2] = {"Sort ", "Cancel "}; ++ char* fuFunctions[] = {"Sort ", "Cancel ", NULL}; + ProcessField* fields = pl->fields; + for (int i = 0; fields[i]; i++) { + char* name = String_trim(Process_fieldTitles[fields[i]]); diff --git a/htop.spec b/htop.spec index b90103c..2215543 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -10,6 +10,7 @@ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz #Patch0: %{name}-0.8.1-nonprint.patch #Patch1: %{name}-0.8.1-processlist.patch +Patch2: %{name}-0.8.2-arrays.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ do top(1). %setup -q #%patch0 -p0 #%patch1 -p0 +%patch2 -p0 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in #sed -i -e '2,3d' -e '9d' htop.desktop @@ -47,8 +49,8 @@ desktop-file-install \ $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop #remove empty direcories -rm -rf $RPM_BUILD_ROOT%{prefix}/lib -rm -rf $RPM_BUILD_ROOT%{prefix}/include +rm -rf $RPM_BUILD_ROOT%{libdir} +rm -rf $RPM_BUILD_ROOT%{includedir} %clean rm -rf $RPM_BUILD_ROOT @@ -64,13 +66,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 12 2009 Rafał Psota - 0.8.2-2 +- "htop aborts after hitting F6 key" fixed (#504795) + * Tue Jun 02 2009 Rafał Psota - 0.8.2-1 - update to 0.8.2 * Tue Feb 24 2009 Fedora Release Engineering - 0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - * Thu Feb 05 2009 Rafał Psota - 0.8.1-3 - "Tree view doesn't work with threads hidden" fixed (#481072) From 3d452d54daaca6951a30d0c1a03bffdbe2b7b04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Psota?= Date: Tue, 23 Jun 2009 15:09:12 +0000 Subject: [PATCH 23/63] update to 0.8.3 --- .cvsignore | 2 +- htop.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8820616..c2d293c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -htop-0.8.2.tar.gz +htop-0.8.3.tar.gz diff --git a/htop.spec b/htop.spec index 2215543..29446b4 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 0.8.2 -Release: 2%{?dist} +Version: 0.8.3 +Release: 1%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -10,7 +10,7 @@ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz #Patch0: %{name}-0.8.1-nonprint.patch #Patch1: %{name}-0.8.1-processlist.patch -Patch2: %{name}-0.8.2-arrays.patch +#Patch2: %{name}-0.8.2-arrays.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -29,7 +29,7 @@ do top(1). %setup -q #%patch0 -p0 #%patch1 -p0 -%patch2 -p0 +#%patch2 -p0 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in #sed -i -e '2,3d' -e '9d' htop.desktop @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 23 2009 Rafał Psota - 0.8.3-1 +- update to 0.8.3 + * Fri Jun 12 2009 Rafał Psota - 0.8.2-2 - "htop aborts after hitting F6 key" fixed (#504795) diff --git a/sources b/sources index c75da9d..cf62635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78c2382dc4ff0cf5a29a5c3bc1e556ec htop-0.8.2.tar.gz +5c9f093f9eaddf6e77aa6d54c2116d0c htop-0.8.3.tar.gz From f5beba1a67c7bd0347661dbd49143a377cd715a4 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 02:16:37 +0000 Subject: [PATCH 24/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 29446b4..5f8a270 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jun 23 2009 Rafał Psota - 0.8.3-1 - update to 0.8.3 From 89886f598ccdfea484c7df5aff9dca2e883b183e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:54:53 +0000 Subject: [PATCH 25/63] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c1cefed..b109cf2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := htop SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8be98b02fdffe5bf13b97217844fc90ac404f6b9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 4 Mar 2010 20:41:35 +0000 Subject: [PATCH 26/63] use system plpa --- htop-0.8.3-system-plpa.patch | 44 ++++++++++++++++++++++++++++++++++++ htop.spec | 13 +++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 htop-0.8.3-system-plpa.patch diff --git a/htop-0.8.3-system-plpa.patch b/htop-0.8.3-system-plpa.patch new file mode 100644 index 0000000..1407dfd --- /dev/null +++ b/htop-0.8.3-system-plpa.patch @@ -0,0 +1,44 @@ +diff -up htop-0.8.3/acinclude.m4.noplpa htop-0.8.3/acinclude.m4 +--- htop-0.8.3/acinclude.m4.noplpa 2010-03-04 15:35:47.457908679 -0500 ++++ htop-0.8.3/acinclude.m4 2010-03-04 15:35:50.721919708 -0500 +@@ -1 +0,0 @@ +-m4_include(plpa-1.1/plpa.m4) +diff -up htop-0.8.3/configure.ac.noplpa htop-0.8.3/configure.ac +--- htop-0.8.3/configure.ac.noplpa 2009-06-23 09:53:18.000000000 -0400 ++++ htop-0.8.3/configure.ac 2010-03-04 15:34:41.578909559 -0500 +@@ -97,12 +97,7 @@ fi + AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) + AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) + +-PLPA_INCLUDED(plpa-1.1) +-PLPA_INIT(plpa_happy=yes, plpa_happy=no) +-AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes"]) +-if test "$plpa_happy" = "yes"; then +- AC_DEFINE([HAVE_PLPA], [1], [Have plpa]) +-fi ++AC_CHECK_LIB([plpa], [plpa_sched_getaffinity], [], [missing_libraries="$missing_libraries libplpa"]) + + AC_CONFIG_FILES([Makefile htop.1]) + AC_OUTPUT +diff -up htop-0.8.3/Makefile.am.noplpa htop-0.8.3/Makefile.am +--- htop-0.8.3/Makefile.am.noplpa 2009-06-02 15:17:57.000000000 -0400 ++++ htop-0.8.3/Makefile.am 2010-03-04 15:34:41.579909477 -0500 +@@ -1,8 +1,4 @@ + +-if HAVE_PLPA +-SUBDIRS = plpa-1.1 +-endif +- + bin_PROGRAMS = htop + dist_man_MANS = htop.1 + EXTRA_DIST = $(dist_man_MANS) htop.desktop htop.png scripts/MakeHeader.py \ +@@ -37,9 +33,6 @@ SUFFIXES = .h + + BUILT_SOURCES = $(myhtopheaders) + htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h +-if HAVE_PLPA +-htop_LDADD = $(top_builddir)/plpa-1.1/src/libplpa_included.la +-endif + + profile: + $(MAKE) all CFLAGS="-pg -O2" diff --git a/htop.spec b/htop.spec index 5f8a270..f8b40fc 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -11,10 +11,11 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz #Patch0: %{name}-0.8.1-nonprint.patch #Patch1: %{name}-0.8.1-processlist.patch #Patch2: %{name}-0.8.2-arrays.patch +Patch3: htop-0.8.3-system-plpa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: ncurses-devel, python +BuildRequires: ncurses-devel, python, libtool, plpa-devel %description htop is an interactive text-mode process viewer for Linux, similar to @@ -30,9 +31,14 @@ do top(1). #%patch0 -p0 #%patch1 -p0 #%patch2 -p0 +%patch3 -p1 -b .noplpa sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in #sed -i -e '2,3d' -e '9d' htop.desktop +# We will use the plpa system copy instead. +rm -rf plpa-1.1/ +autoreconf -i + %build %configure make %{?_smp_mflags} @@ -66,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 4 2010 Tom "spot" Callaway - 0.8.3-3 +- use plpa system copy instead of embedded one + * Fri Jul 24 2009 Fedora Release Engineering - 0.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 67315033273d0258afe2141537d89bf2a989a5dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:50:13 +0000 Subject: [PATCH 27/63] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b109cf2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: htop -# $Id$ -NAME := htop -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 8c480f5c3a7ebf2bcc68b1be2e1abf5a92e49117 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 03:31:51 -0600 Subject: [PATCH 28/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index f8b40fc..3c1c904 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interactive process viewer Summary(pl): Interaktywna przeglądarka procesów @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Mar 4 2010 Tom "spot" Callaway - 0.8.3-3 - use plpa system copy instead of embedded one From fd0de132ad8491d6a6a6d1af4690a97b5224da22 Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Sat, 5 Mar 2011 14:28:01 +0100 Subject: [PATCH 29/63] - Update to 0.9 - Clean specfile, remove Polish translations, unused patches --- htop-0.8.1-nonprint.patch | 11 --- htop-0.8.1-processlist.patch | 15 ---- htop-0.8.2-arrays.patch | 71 ------------------- ...m-plpa.patch => htop-0.9-system-plpa.patch | 47 ++++++------ htop.spec | 24 +++---- 5 files changed, 32 insertions(+), 136 deletions(-) delete mode 100644 htop-0.8.1-nonprint.patch delete mode 100644 htop-0.8.1-processlist.patch delete mode 100644 htop-0.8.2-arrays.patch rename htop-0.8.3-system-plpa.patch => htop-0.9-system-plpa.patch (63%) diff --git a/htop-0.8.1-nonprint.patch b/htop-0.8.1-nonprint.patch deleted file mode 100644 index cbebc06..0000000 --- a/htop-0.8.1-nonprint.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- RichString.c.orig 2008-03-09 03:23:49.000000000 +0100 -+++ RichString.c 2008-11-18 12:30:21.000000000 +0100 -@@ -89,7 +89,7 @@ - inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) { - int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len); - for (int i = this->len, j = 0; i < last; i++, j++) -- this->chstr[i] = data_c[j] | attrs; -+ this->chstr[i] = ((data_c[j] > 31) ? data_c[j] : '?' ) | attrs; - this->chstr[last] = 0; - this->len = last; - } diff --git a/htop-0.8.1-processlist.patch b/htop-0.8.1-processlist.patch deleted file mode 100644 index 6229d63..0000000 --- a/htop-0.8.1-processlist.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ProcessList.c.orig 2008-09-23 08:23:14.000000000 +0200 -+++ ProcessList.c 2009-02-05 19:11:29.000000000 +0100 -@@ -563,9 +563,9 @@ - process->pid = pid; - } - } -- if (parent) { -- process->tgid = parent->pid; -- } -+ -+ process->tgid = parent ? parent->pid : pid; -+ - - if (showUserlandThreads && (!parent || pid != parent->pid)) { - char subdirname[MAX_NAME+1]; diff --git a/htop-0.8.2-arrays.patch b/htop-0.8.2-arrays.patch deleted file mode 100644 index 0654d8a..0000000 --- a/htop-0.8.2-arrays.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: FunctionBar.c -=================================================================== ---- FunctionBar.c (revision 162) -+++ FunctionBar.c (working copy) -@@ -52,12 +52,14 @@ FunctionBar* FunctionBar_new(char** func - this->functions = malloc(sizeof(char*) * 15); - this->keys = malloc(sizeof(char*) * 15); - this->events = malloc(sizeof(int) * 15); -- int i = 0; -- while (i < 15 && functions[i]) { -+ int i; -+ for (i = 0; i < 15; i++) { -+ if (functions[i] == NULL) /* We don't know the size of the array, */ -+ break; /* so let's assume it is NULL terminated */ -+ /* and break if we find that NULL */ - this->functions[i] = String_copy(functions[i]); - this->keys[i] = String_copy(keys[i]); - this->events[i] = events[i]; -- i++; - } - this->size = i; - } else { -Index: htop.c -=================================================================== ---- htop.c (revision 162) -+++ htop.c (working copy) -@@ -151,7 +151,7 @@ static void showHelp(ProcessList* pl) { - clear(); - } - --static char* CategoriesFunctions[10] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done "}; -+static char* CategoriesFunctions[] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done ", NULL}; - - static void Setup_run(Settings* settings, int headerHeight) { - ScreenManager* scr = ScreenManager_new(0, headerHeight, 0, -1, HORIZONTAL, true); -@@ -190,7 +190,7 @@ static HandlerResult pickWithEnter(Panel - } - - static Object* pickFromVector(Panel* panel, Panel* list, int x, int y, char** keyLabels, FunctionBar* prevBar) { -- char* fuKeys[2] = {"Enter", "Esc"}; -+ char* fuKeys[] = {"Enter", "Esc", NULL}; - int fuEvents[2] = {13, 27}; - if (!list->eventHandler) - Panel_setEventHandler(list, pickWithEnter); -@@ -326,7 +326,7 @@ int main(int argc, char** argv) { - Panel_setRichHeader(panel, ProcessList_printHeader(pl)); - - char* searchFunctions[] = {"Next ", "Exit ", " Search: ", NULL}; -- char* searchKeys[] = {"F3", "Esc", " "}; -+ char* searchKeys[] = {"F3", "Esc", " ", NULL}; - int searchEvents[] = {KEY_F(3), 27, ERR}; - FunctionBar* searchBar = FunctionBar_new(searchFunctions, searchKeys, searchEvents); - -@@ -656,7 +656,7 @@ int main(int argc, char** argv) { - - Panel* affinityPanel = AffinityPanel_new(pl->processorCount, curr); - -- char* fuFunctions[2] = {"Set ", "Cancel "}; -+ char* fuFunctions[3] = {"Set ", "Cancel ", NULL}; - void* set = pickFromVector(panel, affinityPanel, 15, headerHeight, fuFunctions, defaultBar); - if (set) { - unsigned long new = AffinityPanel_getAffinity(affinityPanel); -@@ -695,7 +695,7 @@ int main(int argc, char** argv) { - { - Panel* sortPanel = Panel_new(0, 0, 0, 0, LISTITEM_CLASS, true, ListItem_compare); - Panel_setHeader(sortPanel, "Sort by"); -- char* fuFunctions[2] = {"Sort ", "Cancel "}; -+ char* fuFunctions[] = {"Sort ", "Cancel ", NULL}; - ProcessField* fields = pl->fields; - for (int i = 0; fields[i]; i++) { - char* name = String_trim(Process_fieldTitles[fields[i]]); diff --git a/htop-0.8.3-system-plpa.patch b/htop-0.9-system-plpa.patch similarity index 63% rename from htop-0.8.3-system-plpa.patch rename to htop-0.9-system-plpa.patch index 1407dfd..7422cad 100644 --- a/htop-0.8.3-system-plpa.patch +++ b/htop-0.9-system-plpa.patch @@ -2,43 +2,44 @@ diff -up htop-0.8.3/acinclude.m4.noplpa htop-0.8.3/acinclude.m4 --- htop-0.8.3/acinclude.m4.noplpa 2010-03-04 15:35:47.457908679 -0500 +++ htop-0.8.3/acinclude.m4 2010-03-04 15:35:50.721919708 -0500 @@ -1 +0,0 @@ --m4_include(plpa-1.1/plpa.m4) -diff -up htop-0.8.3/configure.ac.noplpa htop-0.8.3/configure.ac ---- htop-0.8.3/configure.ac.noplpa 2009-06-23 09:53:18.000000000 -0400 -+++ htop-0.8.3/configure.ac 2010-03-04 15:34:41.578909559 -0500 -@@ -97,12 +97,7 @@ fi - AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - --PLPA_INCLUDED(plpa-1.1) --PLPA_INIT(plpa_happy=yes, plpa_happy=no) --AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes"]) --if test "$plpa_happy" = "yes"; then -- AC_DEFINE([HAVE_PLPA], [1], [Have plpa]) --fi -+AC_CHECK_LIB([plpa], [plpa_sched_getaffinity], [], [missing_libraries="$missing_libraries libplpa"]) - - AC_CONFIG_FILES([Makefile htop.1]) - AC_OUTPUT +-m4_include(plpa-1.3.2/plpa.m4) diff -up htop-0.8.3/Makefile.am.noplpa htop-0.8.3/Makefile.am --- htop-0.8.3/Makefile.am.noplpa 2009-06-02 15:17:57.000000000 -0400 +++ htop-0.8.3/Makefile.am 2010-03-04 15:34:41.579909477 -0500 @@ -1,8 +1,4 @@ -if HAVE_PLPA --SUBDIRS = plpa-1.1 +-SUBDIRS = plpa-1.3.2 -endif - + ACLOCAL_AMFLAGS=-I m4 + bin_PROGRAMS = htop - dist_man_MANS = htop.1 - EXTRA_DIST = $(dist_man_MANS) htop.desktop htop.png scripts/MakeHeader.py \ -@@ -37,9 +33,6 @@ SUFFIXES = .h +@@ -35,9 +35,6 @@ BUILT_SOURCES = $(myhtopheaders) htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h -if HAVE_PLPA --htop_LDADD = $(top_builddir)/plpa-1.1/src/libplpa_included.la +-htop_LDADD = $(top_builddir)/plpa-1.3.2/src/libplpa/libplpa_included.la -endif profile: $(MAKE) all CFLAGS="-pg -O2" +--- htop-0.9/configure.ac.orig 2011-03-05 13:45:09.000000000 +0100 ++++ htop-0.9/configure.ac 2011-03-05 13:45:29.000000000 +0100 +@@ -104,14 +104,7 @@ + AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) + AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) + +-AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes") +-PLPA_INCLUDED +-PLPA_INIT([plpa-1.3.2], [plpa_happy=yes], [plpa_happy=no]) +-AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes" && test "$enable_plpa" = "yes"]) +-if test "$plpa_happy" = "yes" && test "$enable_plpa" = "yes" +-then +- AC_DEFINE([HAVE_PLPA], [1], [Have plpa]) +-fi ++AC_CHECK_LIB([plpa], [plpa_sched_getaffinity], [], [missing_libraries="$missing_libraries libplpa"]) + + AC_CONFIG_FILES([Makefile htop.1]) + AC_OUTPUT diff --git a/htop.spec b/htop.spec index 3c1c904..11780b3 100644 --- a/htop.spec +++ b/htop.spec @@ -1,17 +1,14 @@ Name: htop -Version: 0.8.3 -Release: 4%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Interactive process viewer -Summary(pl): Interaktywna przeglądarka procesów Group: Applications/System License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz -#Patch0: %{name}-0.8.1-nonprint.patch -#Patch1: %{name}-0.8.1-processlist.patch -#Patch2: %{name}-0.8.2-arrays.patch -Patch3: htop-0.8.3-system-plpa.patch +# Use system plpa +Patch3: htop-0.9-system-plpa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,19 +18,10 @@ BuildRequires: ncurses-devel, python, libtool, plpa-devel htop is an interactive text-mode process viewer for Linux, similar to top(1). -%description -l pl -htop to interaktywna tekstowa przeglądarka procesów dla Linuksa podobna -do top(1). - - %prep %setup -q -#%patch0 -p0 -#%patch1 -p0 -#%patch2 -p0 %patch3 -p1 -b .noplpa sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in -#sed -i -e '2,3d' -e '9d' htop.desktop # We will use the plpa system copy instead. rm -rf plpa-1.1/ @@ -72,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 05 2011 Miloš Jakubíček - 0.9-1 +- Update to 0.9 +- Clean specfile, remove Polish translations, unused patches + * Wed Feb 09 2011 Fedora Release Engineering - 0.8.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c429489ba842409a383b977a28620e713fe8f9ba Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Sat, 5 Mar 2011 14:53:13 +0100 Subject: [PATCH 30/63] htop 0.9 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c2d293c..41799de 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ htop-0.8.3.tar.gz +/htop-0.9.tar.gz diff --git a/sources b/sources index cf62635..f78e644 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c9f093f9eaddf6e77aa6d54c2116d0c htop-0.8.3.tar.gz +7c5507f35f363f3f40183a2ba3c561f8 htop-0.9.tar.gz From c0cd99ad56270f35e3a0df77d840b06181e4b7d6 Mon Sep 17 00:00:00 2001 From: Rahul Date: Sat, 19 Mar 2011 12:14:01 +0530 Subject: [PATCH 31/63] Clean up spec to match current guidelines Drop desktop file. Resolves rhbz#689028 --- htop.spec | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/htop.spec b/htop.spec index 11780b3..32e9a39 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,9 +9,7 @@ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz # Use system plpa Patch3: htop-0.9-system-plpa.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils BuildRequires: ncurses-devel, python, libtool, plpa-devel %description @@ -31,35 +29,30 @@ autoreconf -i %configure make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --vendor fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop - #remove empty direcories rm -rf $RPM_BUILD_ROOT%{libdir} rm -rf $RPM_BUILD_ROOT%{includedir} -%clean -rm -rf $RPM_BUILD_ROOT - +# remove desktop file +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_bindir}/htop -%{_datadir}/applications/fedora-htop.desktop %{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Sat Mar 19 2011 Rahul Sundaram - 0.9-2 +- Clean up spec to match current guidelines +- Drop desktop file. Resolves rhbz#689028 + * Sat Mar 05 2011 Miloš Jakubíček - 0.9-1 - Update to 0.9 - Clean specfile, remove Polish translations, unused patches From 79e2fe4b2e9d4e71a6bc14bbd1d6c65d9590a834 Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Fri, 8 Apr 2011 13:10:48 +0200 Subject: [PATCH 32/63] - include patch by Petr Holasek (pholasek@redhat.com) that adds libpagemap support and introduces new -p cmd option and USS, PSS, SWAP columns --- htop-0.9-libpagemap.patch | 424 ++++++++++++++++++++++++++++++++++++++ htop.spec | 16 +- 2 files changed, 438 insertions(+), 2 deletions(-) create mode 100644 htop-0.9-libpagemap.patch diff --git a/htop-0.9-libpagemap.patch b/htop-0.9-libpagemap.patch new file mode 100644 index 0000000..b7cc27f --- /dev/null +++ b/htop-0.9-libpagemap.patch @@ -0,0 +1,424 @@ +diff -ru --exclude=config.h htop-0.9/configure.ac htop-0.9-patched/configure.ac +--- htop-0.9/configure.ac 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9-patched/configure.ac 2011-03-09 16:58:38.471801331 +0100 +@@ -18,11 +18,13 @@ + + # Checks for libraries. + AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) ++AC_CHECK_LIB([pagemap], [init_pgmap_table], [], [], []) ++AC_CHECK_LIB([pthread], [pthread_create], [], [], []) + + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +-AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ ++AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h pthread.h],[:],[ + missing_headers="$missing_headers $ac_header" + ]) + +diff -ru --exclude=config.h htop-0.9/htop.1 htop-0.9-patched/htop.1 +--- htop-0.9/htop.1 2010-11-23 17:34:04.000000000 +0100 ++++ htop-0.9-patched/htop.1 2011-03-09 16:44:07.065449472 +0100 +@@ -25,6 +25,9 @@ + \fB\-u USERNAME\fR + Show only processes of a given user + .TP ++\fB\-p\fR ++Start working thread for pagemap memory stats ++.TP + \fB\-\-sort\-key COLUMN\fR + Sort by this column (use --sort-key help for a column list) + .PP +diff -ru --exclude=config.h htop-0.9/htop.1.in htop-0.9-patched/htop.1.in +--- htop-0.9/htop.1.in 2010-06-17 21:03:41.000000000 +0200 ++++ htop-0.9-patched/htop.1.in 2011-03-09 16:44:07.066449478 +0100 +@@ -25,6 +25,9 @@ + \fB\-u USERNAME\fR + Show only processes of a given user + .TP ++\fB\-p\fR ++Start working thread for pagemap memory stats ++.TP + \fB\-\-sort\-key COLUMN\fR + Sort by this column (use --sort-key help for a column list) + .PP +diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c +--- htop-0.9/htop.c 2010-11-24 19:45:38.000000000 +0100 ++++ htop-0.9-patched/htop.c 2011-03-09 16:44:07.067449482 +0100 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "ProcessList.h" + #include "CRT.h" +@@ -52,6 +53,9 @@ + "-C --no-color Use a monochrome color scheme\n" + "-d --delay=DELAY Set the delay between updates, in tenths of seconds\n" + "-h --help Print this help screen\n" ++#ifdef HAVE_LIBPAGEMAP ++ "-p --pagemap Count memory stats from pagemap kernel interface\n" ++#endif + "-s --sort-key=COLUMN Sort by COLUMN (try --sort-key=help for a list)\n" + "-u --user=USERNAME Show only processes of a given user\n" + "-v --version Print version info\n" +@@ -244,12 +248,23 @@ + ProcessList_printHeader(pl, Panel_getHeader(panel)); + } + ++#ifdef HAVE_LIBPAGEMAP ++static void * pagemapCnt(ProcessList * pl) { ++ while(1) { ++ pl->pagemap_table = init_pgmap_table(pl->pagemap_table); ++ open_pgmap_table(pl->pagemap_table,0); ++ } ++ return; ++} ++#endif ++ + int main(int argc, char** argv) { + + int delay = -1; + bool userOnly = false; + uid_t userId = 0; + int usecolors = 1; ++ int pagemap_enable = 0; + + int opt, opti=0; + static struct option long_opts[] = +@@ -261,6 +276,9 @@ + {"user", required_argument, 0, 'u'}, + {"no-color", no_argument, 0, 'C'}, + {"no-colour",no_argument, 0, 'C'}, ++#ifdef HAVE_LIBPAGEMAP ++ {"pagemap", no_argument, 0, 'p'}, ++#endif + {0,0,0,0} + }; + int sortKey = 0; +@@ -272,7 +290,7 @@ + setlocale(LC_CTYPE, getenv("LC_ALL")); + + /* Parse arguments */ +- while ((opt = getopt_long_only(argc, argv, "hvCs:d:u:", long_opts, &opti))) { ++ while ((opt = getopt_long_only(argc, argv, "hpvCs:d:u:", long_opts, &opti))) { + if (opt == EOF) break; + switch (opt) { + case 'h': +@@ -305,6 +323,11 @@ + case 'C': + usecolors=0; + break; ++#ifdef HAVE_LIBPAGEMAP ++ case 'p': ++ pagemap_enable=1; ++ break; ++#endif + } + } + +@@ -379,6 +402,18 @@ + int ch = 0; + int closeTimeout = 0; + ++#ifdef HAVE_LIBPAGEMAP ++ // declare threading stuff ++ static pthread_t libpagemap_thread; ++ static pthread_attr_t t_attr; ++ if (pagemap_enable) { ++ // start thread ++ pthread_attr_init(&t_attr); ++ pthread_attr_setdetachstate(&t_attr, PTHREAD_CREATE_DETACHED); ++ pthread_create(&libpagemap_thread, &t_attr, (void * (*)(void *)) &pagemapCnt, (void *) pl); ++ } ++#endif ++ + while (!quit) { + gettimeofday(&tv, NULL); + newTime = ((double)tv.tv_sec * 10) + ((double)tv.tv_usec / 100000); +@@ -817,6 +852,12 @@ + if (settings->changed) + Settings_write(settings); + Header_delete(header); ++#ifdef HAVE_LIBPAGEMAP ++ if (pagemap_enable) { ++ pthread_cancel(libpagemap_thread); ++ free_pgmap_table(pl->pagemap_table); ++ } ++#endif + ProcessList_delete(pl); + FunctionBar_delete((Object*)searchBar); + FunctionBar_delete((Object*)defaultBar); +diff -ru --exclude=config.h htop-0.9/htop.h htop-0.9-patched/htop.h +--- htop-0.9/htop.h 2010-11-24 19:45:40.000000000 +0100 ++++ htop-0.9-patched/htop.h 2011-03-09 16:48:37.672644570 +0100 +@@ -17,6 +17,9 @@ + #include + #include + #include ++#ifdef HAVE_LIBPAGEMAP ++#include ++#endif + + #include "ProcessList.h" + #include "CRT.h" +diff -ru --exclude=config.h htop-0.9/Process.c htop-0.9-patched/Process.c +--- htop-0.9/Process.c 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9-patched/Process.c 2011-03-09 16:44:07.069449489 +0100 +@@ -72,6 +72,9 @@ + #ifdef HAVE_CGROUP + CGROUP, + #endif ++ #ifdef HAVE_LIBPAGEMAP ++ M_USS, M_PSS, M_SWAP, ++ #endif + LAST_PROCESSFIELD + } ProcessField; + +@@ -115,7 +118,7 @@ + #ifdef DEBUG + long int itrealvalue; + unsigned long int vsize; +- long int rss; ++ long 1nt rss; + unsigned long int rlim; + unsigned long int startcode; + unsigned long int endcode; +@@ -139,6 +142,9 @@ + int m_drs; + int m_lrs; + int m_dt; ++ unsigned int m_uss; ++ unsigned int m_pss; ++ unsigned int m_swap; + uid_t st_uid; + float percent_cpu; + float percent_mem; +@@ -198,6 +204,9 @@ + #ifdef HAVE_CGROUP + "CGROUP", + #endif ++#ifdef HAVE_LIBPAGEMAP ++ "M_USS", "M_PSS", "M_SWAP", ++#endif + "*** report bug! ***" + }; + +@@ -223,6 +232,9 @@ + #ifdef HAVE_CGROUP + " CGROUP ", + #endif ++#ifdef HAVE_LIBPAGEMAP ++ " USS ", " PSS ", " SWAP ", ++#endif + "*** report bug! ***" + }; + +@@ -393,6 +405,32 @@ + case M_SIZE: Process_printLargeNumber(this, str, this->m_size * PAGE_SIZE_KB); return; + case M_RESIDENT: Process_printLargeNumber(this, str, this->m_resident * PAGE_SIZE_KB); return; + case M_SHARE: Process_printLargeNumber(this, str, this->m_share * PAGE_SIZE_KB); return; ++ #ifdef HAVE_LIBPAGEMAP ++ case M_USS: ++ if (Process_getuid == 0 && this->pl->pagemap_table != NULL) { ++ Process_printLargeNumber(this, str, this->m_uss * PAGE_SIZE_KB); ++ return; ++ } else { ++ snprintf(buffer, n, " - "); ++ } ++ break; ++ case M_PSS: ++ if (Process_getuid == 0 && this->pl->pagemap_table != NULL) { ++ Process_printLargeNumber(this, str, this->m_pss * PAGE_SIZE_KB); ++ return; ++ } else { ++ snprintf(buffer, n, " - "); ++ } ++ break; ++ case M_SWAP: ++ if ((Process_getuid == 0 || Process_getuid == this->st_uid) && this->pl->pagemap_table != NULL) { ++ Process_printLargeNumber(this, str, this->m_swap * PAGE_SIZE_KB); ++ return; ++ } else { ++ snprintf(buffer, n, " - "); ++ } ++ break; ++ #endif + case ST_UID: snprintf(buffer, n, "%4d ", this->st_uid); break; + case USER: { + if (Process_getuid != (int) this->st_uid) +@@ -583,6 +621,14 @@ + return (p2->m_resident - p1->m_resident); + case M_SHARE: + return (p2->m_share - p1->m_share); ++ #ifdef HAVE_LIBPAGEMAP ++ case M_USS: ++ return (p2->m_uss - p1->m_uss); ++ case M_PSS: ++ return (p2->m_pss - p1->m_pss); ++ case M_SWAP: ++ return (p2->m_swap - p1->m_swap); ++ #endif + case PERCENT_CPU: + return (p2->percent_cpu > p1->percent_cpu ? 1 : -1); + case PERCENT_MEM: +diff -ru --exclude=config.h htop-0.9/Process.h htop-0.9-patched/Process.h +--- htop-0.9/Process.h 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9-patched/Process.h 2011-03-09 16:44:07.070449492 +0100 +@@ -74,6 +74,9 @@ + #ifdef HAVE_CGROUP + CGROUP, + #endif ++ #ifdef HAVE_LIBPAGEMAP ++ M_USS, M_PSS, M_SWAP, ++ #endif + LAST_PROCESSFIELD + } ProcessField; + +@@ -117,7 +120,7 @@ + #ifdef DEBUG + long int itrealvalue; + unsigned long int vsize; +- long int rss; ++ long 1nt rss; + unsigned long int rlim; + unsigned long int startcode; + unsigned long int endcode; +@@ -141,6 +144,9 @@ + int m_drs; + int m_lrs; + int m_dt; ++ unsigned int m_uss; ++ unsigned int m_pss; ++ unsigned int m_swap; + uid_t st_uid; + float percent_cpu; + float percent_mem; +diff -ru --exclude=config.h htop-0.9/ProcessList.c htop-0.9-patched/ProcessList.c +--- htop-0.9/ProcessList.c 2010-11-26 17:50:25.000000000 +0100 ++++ htop-0.9-patched/ProcessList.c 2011-03-09 16:44:07.071449495 +0100 +@@ -10,6 +10,9 @@ + #include "config.h" + #endif + ++#ifdef HAVE_LIBPAGEMAP ++#include "libpagemap.h" ++#endif + #include "ProcessList.h" + #include "Process.h" + #include "Vector.h" +@@ -28,6 +31,7 @@ + #include + #include + #include ++#include + + #include "debug.h" + #include +@@ -125,6 +129,10 @@ + bool highlightThreads; + bool detailedCPUTime; + ++#ifdef HAVE_LIBPAGEMAP ++ pagemap_tbl * pagemap_table; ++#endif ++ + } ProcessList; + }*/ + +@@ -177,6 +185,9 @@ + this->highlightBaseName = false; + this->highlightMegabytes = false; + this->detailedCPUTime = false; ++#ifdef HAVE_LIBPAGEMAP ++ this->pagemap_table = NULL; ++#endif + + return this; + } +@@ -429,6 +440,29 @@ + return (num == 7); + } + ++#ifdef HAVE_LIBPAGEMAP ++ ++static bool ProcessList_readPagemap(ProcessList* plist ,Process* process, const char * name) { ++ ++ process_pagemap_t* p = NULL; ++ int pid = 0; ++ ++ pid = atoi(name); ++ ++ if ((p = get_single_pgmap(plist->pagemap_table,pid)) == NULL) { ++ process->m_uss = 0; ++ process->m_pss = 0; ++ process->m_swap = 0; ++ } else { ++ process->m_uss = p->uss; ++ process->m_pss = p->pss; ++ process->m_swap = p->swap; ++ } ++ return true; ++} ++ ++#endif ++ + #ifdef HAVE_OPENVZ + + static void ProcessList_readOpenVZData(Process* process, const char* dirname, const char* name) { +@@ -589,6 +623,11 @@ + if (! ProcessList_readStatmFile(process, dirname, name)) + goto errorReadingProcess; + ++ #ifdef HAVE_LIBPAGEMAP ++ if (! ProcessList_readPagemap(this, process, name)) ++ goto errorReadingProcess; ++ #endif ++ + process->show = ! ((hideKernelThreads && Process_isKernelThread(process)) || (hideUserlandThreads && Process_isUserlandThread(process))); + + char command[MAX_NAME+1]; +diff -ru --exclude=config.h htop-0.9/ProcessList.h htop-0.9-patched/ProcessList.h +--- htop-0.9/ProcessList.h 2010-11-26 17:51:25.000000000 +0100 ++++ htop-0.9-patched/ProcessList.h 2011-03-09 16:44:07.072449499 +0100 +@@ -14,6 +14,9 @@ + #include "config.h" + #endif + ++#ifdef HAVE_LIBPAGEMAP ++#include "libpagemap.h" ++#endif + #include "Process.h" + #include "Vector.h" + #include "UsersTable.h" +@@ -31,6 +34,7 @@ + #include + #include + #include ++#include + + #include "debug.h" + #include +@@ -125,6 +129,10 @@ + bool highlightThreads; + bool detailedCPUTime; + ++#ifdef HAVE_LIBPAGEMAP ++ pagemap_tbl * pagemap_table; ++#endif ++ + } ProcessList; + + ProcessList* ProcessList_new(UsersTable* usersTable); +@@ -145,6 +153,10 @@ + + #endif + ++#ifdef HAVE_LIBPAGEMAP ++ ++#endif ++ + #ifdef HAVE_OPENVZ + + #endif diff --git a/htop.spec b/htop.spec index 32e9a39..bdf0c46 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -9,8 +9,14 @@ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz # Use system plpa Patch3: htop-0.9-system-plpa.patch +# Patch by Petr Holasek (pholasek@redhat.com) +# Filed into upstream bugtracker: +# http://sourceforge.net/tracker/?func=detail&aid=3169589&group_id=108839&atid=651635 +Patch4: htop-0.9-libpagemap.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, python, libtool, plpa-devel +BuildRequires: desktop-file-utils +BuildRequires: ncurses-devel, python, libtool, plpa-devel, libpagemap-devel %description htop is an interactive text-mode process viewer for Linux, similar to @@ -19,6 +25,7 @@ top(1). %prep %setup -q %patch3 -p1 -b .noplpa +%patch4 -p1 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in # We will use the plpa system copy instead. @@ -49,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Fri Apr 08 2011 Miloš Jakubíček - 0.9-3 +- include patch by Petr Holasek (pholasek@redhat.com) that adds + libpagemap support and introduces new -p cmd option and USS, + PSS, SWAP columns + * Sat Mar 19 2011 Rahul Sundaram - 0.9-2 - Clean up spec to match current guidelines - Drop desktop file. Resolves rhbz#689028 From 5502569660d7edaa46169598d47964258c0eb3df Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 23:00:28 -0600 Subject: [PATCH 33/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index bdf0c46..4526b01 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Apr 08 2011 Miloš Jakubíček - 0.9-3 - include patch by Petr Holasek (pholasek@redhat.com) that adds libpagemap support and introduces new -p cmd option and USS, From 930070f94deb4dafdab3ddb449ac718493000e2c Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Tue, 7 Feb 2012 18:07:41 +0100 Subject: [PATCH 34/63] Update to 1.0 - Build with --enable-openvz --enable-vserver --enable-taskstats --enable-unicode --enable-native-affinity --enable-cgroup - Drop htop-0.9-system-plpa.patch (no PLPA needed anymore) --- .gitignore | 1 + htop-0.9-system-plpa.patch | 45 ----- ...pagemap.patch => htop-1.0-libpagemap.patch | 155 +++++++++--------- htop.spec | 25 +-- sources | 2 +- 5 files changed, 93 insertions(+), 135 deletions(-) delete mode 100644 htop-0.9-system-plpa.patch rename htop-0.9-libpagemap.patch => htop-1.0-libpagemap.patch (72%) diff --git a/.gitignore b/.gitignore index 41799de..fe4d6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ htop-0.8.3.tar.gz /htop-0.9.tar.gz +/htop-1.0.tar.gz diff --git a/htop-0.9-system-plpa.patch b/htop-0.9-system-plpa.patch deleted file mode 100644 index 7422cad..0000000 --- a/htop-0.9-system-plpa.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up htop-0.8.3/acinclude.m4.noplpa htop-0.8.3/acinclude.m4 ---- htop-0.8.3/acinclude.m4.noplpa 2010-03-04 15:35:47.457908679 -0500 -+++ htop-0.8.3/acinclude.m4 2010-03-04 15:35:50.721919708 -0500 -@@ -1 +0,0 @@ --m4_include(plpa-1.3.2/plpa.m4) -diff -up htop-0.8.3/Makefile.am.noplpa htop-0.8.3/Makefile.am ---- htop-0.8.3/Makefile.am.noplpa 2009-06-02 15:17:57.000000000 -0400 -+++ htop-0.8.3/Makefile.am 2010-03-04 15:34:41.579909477 -0500 -@@ -1,8 +1,4 @@ - --if HAVE_PLPA --SUBDIRS = plpa-1.3.2 --endif -- - ACLOCAL_AMFLAGS=-I m4 - - bin_PROGRAMS = htop -@@ -35,9 +35,6 @@ - - BUILT_SOURCES = $(myhtopheaders) - htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h --if HAVE_PLPA --htop_LDADD = $(top_builddir)/plpa-1.3.2/src/libplpa/libplpa_included.la --endif - - profile: - $(MAKE) all CFLAGS="-pg -O2" ---- htop-0.9/configure.ac.orig 2011-03-05 13:45:09.000000000 +0100 -+++ htop-0.9/configure.ac 2011-03-05 13:45:29.000000000 +0100 -@@ -104,14 +104,7 @@ - AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - --AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes") --PLPA_INCLUDED --PLPA_INIT([plpa-1.3.2], [plpa_happy=yes], [plpa_happy=no]) --AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes" && test "$enable_plpa" = "yes"]) --if test "$plpa_happy" = "yes" && test "$enable_plpa" = "yes" --then -- AC_DEFINE([HAVE_PLPA], [1], [Have plpa]) --fi -+AC_CHECK_LIB([plpa], [plpa_sched_getaffinity], [], [missing_libraries="$missing_libraries libplpa"]) - - AC_CONFIG_FILES([Makefile htop.1]) - AC_OUTPUT diff --git a/htop-0.9-libpagemap.patch b/htop-1.0-libpagemap.patch similarity index 72% rename from htop-0.9-libpagemap.patch rename to htop-1.0-libpagemap.patch index b7cc27f..051e815 100644 --- a/htop-0.9-libpagemap.patch +++ b/htop-1.0-libpagemap.patch @@ -1,7 +1,7 @@ -diff -ru --exclude=config.h htop-0.9/configure.ac htop-0.9-patched/configure.ac ---- htop-0.9/configure.ac 2010-11-23 16:56:32.000000000 +0100 -+++ htop-0.9-patched/configure.ac 2011-03-09 16:58:38.471801331 +0100 -@@ -18,11 +18,13 @@ +diff -Naur htop-1.0/configure.ac.orig htop-1.0/configure.ac +--- htop-1.0/configure.ac.orig 2011-11-21 03:46:48.000000000 +0100 ++++ htop-1.0/configure.ac 2012-02-07 17:21:59.098852884 +0100 +@@ -23,11 +23,13 @@ # Checks for libraries. AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) @@ -15,36 +15,36 @@ diff -ru --exclude=config.h htop-0.9/configure.ac htop-0.9-patched/configure.ac +AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h pthread.h],[:],[ missing_headers="$missing_headers $ac_header" ]) - -diff -ru --exclude=config.h htop-0.9/htop.1 htop-0.9-patched/htop.1 ---- htop-0.9/htop.1 2010-11-23 17:34:04.000000000 +0100 -+++ htop-0.9-patched/htop.1 2011-03-09 16:44:07.065449472 +0100 -@@ -25,6 +25,9 @@ - \fB\-u USERNAME\fR - Show only processes of a given user + AC_CHECK_HEADERS([execinfo.h],[:],[:]) +diff -Naur htop-1.0/htop.1.orig htop-1.0/htop.1 +--- htop-1.0/htop.1.orig 2012-02-07 17:28:48.935889755 +0100 ++++ htop-1.0/htop.1 2012-02-07 17:27:44.087881744 +0100 +@@ -32,6 +32,9 @@ + \fB\-u \-\-user=USERNAME\fR + Show only the processes of a given user .TP +\fB\-p\fR +Start working thread for pagemap memory stats +.TP - \fB\-\-sort\-key COLUMN\fR - Sort by this column (use --sort-key help for a column list) - .PP -diff -ru --exclude=config.h htop-0.9/htop.1.in htop-0.9-patched/htop.1.in ---- htop-0.9/htop.1.in 2010-06-17 21:03:41.000000000 +0200 -+++ htop-0.9-patched/htop.1.in 2011-03-09 16:44:07.066449478 +0100 -@@ -25,6 +25,9 @@ - \fB\-u USERNAME\fR - Show only processes of a given user + \fB\-s \-\-sort\-key COLUMN\fR + Sort by this column (use \-\-sort\-key help for a column list) + .TP +diff -Naur htop-1.0/htop.1.in.orig htop-1.0/htop.1.in +--- htop-1.0/htop.1.in.orig 2011-09-27 01:59:36.000000000 +0200 ++++ htop-1.0/htop.1.in 2012-02-07 17:25:23.161867112 +0100 +@@ -32,6 +32,9 @@ + \fB\-u \-\-user=USERNAME\fR + Show only the processes of a given user .TP +\fB\-p\fR +Start working thread for pagemap memory stats +.TP - \fB\-\-sort\-key COLUMN\fR - Sort by this column (use --sort-key help for a column list) - .PP -diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c ---- htop-0.9/htop.c 2010-11-24 19:45:38.000000000 +0100 -+++ htop-0.9-patched/htop.c 2011-03-09 16:44:07.067449482 +0100 + \fB\-s \-\-sort\-key COLUMN\fR + Sort by this column (use \-\-sort\-key help for a column list) + .TP +diff -Naur htop-1.0/htop.c.orig htop-1.0/htop.c +--- htop-1.0/htop.c.orig 2011-11-21 03:48:11.000000000 +0100 ++++ htop-1.0/htop.c 2012-02-07 17:36:15.348965585 +0100 @@ -13,6 +13,7 @@ #include #include @@ -53,7 +53,7 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c #include "ProcessList.h" #include "CRT.h" -@@ -52,6 +53,9 @@ +@@ -51,6 +52,9 @@ "-C --no-color Use a monochrome color scheme\n" "-d --delay=DELAY Set the delay between updates, in tenths of seconds\n" "-h --help Print this help screen\n" @@ -63,7 +63,7 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c "-s --sort-key=COLUMN Sort by COLUMN (try --sort-key=help for a list)\n" "-u --user=USERNAME Show only processes of a given user\n" "-v --version Print version info\n" -@@ -244,12 +248,23 @@ +@@ -238,6 +242,16 @@ ProcessList_printHeader(pl, Panel_getHeader(panel)); } @@ -77,17 +77,18 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c +} +#endif + - int main(int argc, char** argv) { - - int delay = -1; + typedef struct IncBuffer_ { + char buffer[INCSEARCH_MAX]; + int index; +@@ -255,6 +269,7 @@ bool userOnly = false; uid_t userId = 0; int usecolors = 1; + int pagemap_enable = 0; + TreeType treeType = TREE_TYPE_AUTO; int opt, opti=0; - static struct option long_opts[] = -@@ -261,6 +276,9 @@ +@@ -267,6 +282,9 @@ {"user", required_argument, 0, 'u'}, {"no-color", no_argument, 0, 'C'}, {"no-colour",no_argument, 0, 'C'}, @@ -97,16 +98,16 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c {0,0,0,0} }; int sortKey = 0; -@@ -272,7 +290,7 @@ - setlocale(LC_CTYPE, getenv("LC_ALL")); +@@ -280,7 +298,7 @@ + setlocale(LC_CTYPE, ""); /* Parse arguments */ -- while ((opt = getopt_long_only(argc, argv, "hvCs:d:u:", long_opts, &opti))) { -+ while ((opt = getopt_long_only(argc, argv, "hpvCs:d:u:", long_opts, &opti))) { +- while ((opt = getopt_long(argc, argv, "hvCs:d:u:", long_opts, &opti))) { ++ while ((opt = getopt_long(argc, argv, "hpvCs:d:u:", long_opts, &opti))) { if (opt == EOF) break; switch (opt) { case 'h': -@@ -305,6 +323,11 @@ +@@ -320,6 +338,11 @@ case 'C': usecolors=0; break; @@ -115,11 +116,11 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c + pagemap_enable=1; + break; +#endif + default: + exit(1); } - } - -@@ -379,6 +402,18 @@ - int ch = 0; +@@ -432,6 +455,18 @@ + int ch = ERR; int closeTimeout = 0; +#ifdef HAVE_LIBPAGEMAP @@ -137,7 +138,7 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c while (!quit) { gettimeofday(&tv, NULL); newTime = ((double)tv.tv_sec * 10) + ((double)tv.tv_usec / 100000); -@@ -817,6 +852,12 @@ +@@ -912,6 +947,12 @@ if (settings->changed) Settings_write(settings); Header_delete(header); @@ -148,8 +149,8 @@ diff -ru --exclude=config.h htop-0.9/htop.c htop-0.9-patched/htop.c + } +#endif ProcessList_delete(pl); - FunctionBar_delete((Object*)searchBar); - FunctionBar_delete((Object*)defaultBar); + FunctionBar_delete((Object*)incFilter.bar); + FunctionBar_delete((Object*)incSearch.bar); diff -ru --exclude=config.h htop-0.9/htop.h htop-0.9-patched/htop.h --- htop-0.9/htop.h 2010-11-24 19:45:40.000000000 +0100 +++ htop-0.9-patched/htop.h 2011-03-09 16:48:37.672644570 +0100 @@ -163,9 +164,9 @@ diff -ru --exclude=config.h htop-0.9/htop.h htop-0.9-patched/htop.h #include "ProcessList.h" #include "CRT.h" -diff -ru --exclude=config.h htop-0.9/Process.c htop-0.9-patched/Process.c ---- htop-0.9/Process.c 2010-11-23 16:56:32.000000000 +0100 -+++ htop-0.9-patched/Process.c 2011-03-09 16:44:07.069449489 +0100 +diff -Naur htop-1.0/Process.c.orig htop-1.0/Process.c +--- htop-1.0/Process.c.orig 2011-11-21 03:47:49.000000000 +0100 ++++ htop-1.0/Process.c 2012-02-07 17:41:02.322032224 +0100 @@ -72,6 +72,9 @@ #ifdef HAVE_CGROUP CGROUP, @@ -215,14 +216,14 @@ diff -ru --exclude=config.h htop-0.9/Process.c htop-0.9-patched/Process.c "*** report bug! ***" }; -@@ -393,6 +405,32 @@ - case M_SIZE: Process_printLargeNumber(this, str, this->m_size * PAGE_SIZE_KB); return; - case M_RESIDENT: Process_printLargeNumber(this, str, this->m_resident * PAGE_SIZE_KB); return; - case M_SHARE: Process_printLargeNumber(this, str, this->m_share * PAGE_SIZE_KB); return; +@@ -440,6 +452,32 @@ + case M_SIZE: Process_humanNumber(this, str, this->m_size * PAGE_SIZE_KB); return; + case M_RESIDENT: Process_humanNumber(this, str, this->m_resident * PAGE_SIZE_KB); return; + case M_SHARE: Process_humanNumber(this, str, this->m_share * PAGE_SIZE_KB); return; + #ifdef HAVE_LIBPAGEMAP + case M_USS: + if (Process_getuid == 0 && this->pl->pagemap_table != NULL) { -+ Process_printLargeNumber(this, str, this->m_uss * PAGE_SIZE_KB); ++ Process_humanNumber(this, str, this->m_uss * PAGE_SIZE_KB); + return; + } else { + snprintf(buffer, n, " - "); @@ -230,7 +231,7 @@ diff -ru --exclude=config.h htop-0.9/Process.c htop-0.9-patched/Process.c + break; + case M_PSS: + if (Process_getuid == 0 && this->pl->pagemap_table != NULL) { -+ Process_printLargeNumber(this, str, this->m_pss * PAGE_SIZE_KB); ++ Process_humanNumber(this, str, this->m_pss * PAGE_SIZE_KB); + return; + } else { + snprintf(buffer, n, " - "); @@ -238,7 +239,7 @@ diff -ru --exclude=config.h htop-0.9/Process.c htop-0.9-patched/Process.c + break; + case M_SWAP: + if ((Process_getuid == 0 || Process_getuid == this->st_uid) && this->pl->pagemap_table != NULL) { -+ Process_printLargeNumber(this, str, this->m_swap * PAGE_SIZE_KB); ++ Process_humanNumber(this, str, this->m_swap * PAGE_SIZE_KB); + return; + } else { + snprintf(buffer, n, " - "); @@ -248,7 +249,7 @@ diff -ru --exclude=config.h htop-0.9/Process.c htop-0.9-patched/Process.c case ST_UID: snprintf(buffer, n, "%4d ", this->st_uid); break; case USER: { if (Process_getuid != (int) this->st_uid) -@@ -583,6 +621,14 @@ +@@ -677,6 +715,14 @@ return (p2->m_resident - p1->m_resident); case M_SHARE: return (p2->m_share - p1->m_share); @@ -295,9 +296,9 @@ diff -ru --exclude=config.h htop-0.9/Process.h htop-0.9-patched/Process.h uid_t st_uid; float percent_cpu; float percent_mem; -diff -ru --exclude=config.h htop-0.9/ProcessList.c htop-0.9-patched/ProcessList.c ---- htop-0.9/ProcessList.c 2010-11-26 17:50:25.000000000 +0100 -+++ htop-0.9-patched/ProcessList.c 2011-03-09 16:44:07.071449495 +0100 +diff -Naur htop-1.0/ProcessList.c.orig htop-1.0/ProcessList.c +--- htop-1.0/ProcessList.c.orig 2011-11-21 03:47:37.000000000 +0100 ++++ htop-1.0/ProcessList.c 2012-02-07 17:43:52.289077822 +0100 @@ -10,6 +10,9 @@ #include "config.h" #endif @@ -316,28 +317,28 @@ diff -ru --exclude=config.h htop-0.9/ProcessList.c htop-0.9-patched/ProcessList. #include "debug.h" #include -@@ -125,6 +129,10 @@ - bool highlightThreads; - bool detailedCPUTime; +@@ -148,6 +152,10 @@ + bool countCPUsFromZero; + const char **treeStr; +#ifdef HAVE_LIBPAGEMAP + pagemap_tbl * pagemap_table; +#endif + } ProcessList; - }*/ -@@ -177,6 +185,9 @@ - this->highlightBaseName = false; - this->highlightMegabytes = false; + }*/ +@@ -230,6 +238,9 @@ this->detailedCPUTime = false; + this->countCPUsFromZero = false; + this->treeStr = NULL; +#ifdef HAVE_LIBPAGEMAP + this->pagemap_table = NULL; -+#endif ++#endif return this; } -@@ -429,6 +440,29 @@ +@@ -496,6 +507,29 @@ return (num == 7); } @@ -367,7 +368,7 @@ diff -ru --exclude=config.h htop-0.9/ProcessList.c htop-0.9-patched/ProcessList. #ifdef HAVE_OPENVZ static void ProcessList_readOpenVZData(Process* process, const char* dirname, const char* name) { -@@ -589,6 +623,11 @@ +@@ -660,6 +694,11 @@ if (! ProcessList_readStatmFile(process, dirname, name)) goto errorReadingProcess; @@ -379,9 +380,9 @@ diff -ru --exclude=config.h htop-0.9/ProcessList.c htop-0.9-patched/ProcessList. process->show = ! ((hideKernelThreads && Process_isKernelThread(process)) || (hideUserlandThreads && Process_isUserlandThread(process))); char command[MAX_NAME+1]; -diff -ru --exclude=config.h htop-0.9/ProcessList.h htop-0.9-patched/ProcessList.h ---- htop-0.9/ProcessList.h 2010-11-26 17:51:25.000000000 +0100 -+++ htop-0.9-patched/ProcessList.h 2011-03-09 16:44:07.072449499 +0100 +diff -Naur htop-1.0/ProcessList.h.orig htop-1.0/ProcessList.h +--- htop-1.0/ProcessList.h.orig 2011-11-21 03:49:01.000000000 +0100 ++++ htop-1.0/ProcessList.h 2012-02-07 17:45:46.224110828 +0100 @@ -14,6 +14,9 @@ #include "config.h" #endif @@ -400,9 +401,9 @@ diff -ru --exclude=config.h htop-0.9/ProcessList.h htop-0.9-patched/ProcessList. #include "debug.h" #include -@@ -125,6 +129,10 @@ - bool highlightThreads; - bool detailedCPUTime; +@@ -150,6 +154,10 @@ + bool countCPUsFromZero; + const char **treeStr; +#ifdef HAVE_LIBPAGEMAP + pagemap_tbl * pagemap_table; @@ -410,8 +411,8 @@ diff -ru --exclude=config.h htop-0.9/ProcessList.h htop-0.9-patched/ProcessList. + } ProcessList; - ProcessList* ProcessList_new(UsersTable* usersTable); -@@ -145,6 +153,10 @@ + +@@ -175,6 +183,10 @@ #endif diff --git a/htop.spec b/htop.spec index 4526b01..ccd8714 100644 --- a/htop.spec +++ b/htop.spec @@ -1,14 +1,12 @@ Name: htop -Version: 0.9 -Release: 4%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz -# Use system plpa -Patch3: htop-0.9-system-plpa.patch # Patch by Petr Holasek (pholasek@redhat.com) # Filed into upstream bugtracker: # http://sourceforge.net/tracker/?func=detail&aid=3169589&group_id=108839&atid=651635 @@ -16,7 +14,7 @@ Patch4: htop-0.9-libpagemap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: ncurses-devel, python, libtool, plpa-devel, libpagemap-devel +BuildRequires: ncurses-devel, python, libtool, libpagemap-devel %description htop is an interactive text-mode process viewer for Linux, similar to @@ -24,16 +22,13 @@ top(1). %prep %setup -q -%patch3 -p1 -b .noplpa -%patch4 -p1 +%patch4 -p1 -b.pgmap sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in -# We will use the plpa system copy instead. -rm -rf plpa-1.1/ -autoreconf -i %build -%configure +%configure --enable-openvz --enable-vserver --enable-taskstats \ + --enable-unicode --enable-native-affinity --enable-cgroup make %{?_smp_mflags} %install @@ -49,13 +44,19 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog README %{_bindir}/htop %{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Tue Feb 07 2012 Miloš Jakubíček - 1.0-1 +- Update to 1.0 +- Build with --enable-openvz --enable-vserver --enable-taskstats + --enable-unicode --enable-native-affinity --enable-cgroup +- Drop htop-0.9-system-plpa.patch (no PLPA needed anymore) + * Fri Jan 13 2012 Fedora Release Engineering - 0.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index f78e644..cc11c26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c5507f35f363f3f40183a2ba3c561f8 htop-0.9.tar.gz +325112ca7947ea1f6d6441f631e00384 htop-1.0.tar.gz From 9ed46dfa00d31eed28f55b72039966d44a721343 Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Wed, 8 Feb 2012 08:38:27 +0100 Subject: [PATCH 35/63] fix updated pgmap patch name --- htop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index ccd8714..8e229b1 100644 --- a/htop.spec +++ b/htop.spec @@ -10,7 +10,7 @@ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz # Patch by Petr Holasek (pholasek@redhat.com) # Filed into upstream bugtracker: # http://sourceforge.net/tracker/?func=detail&aid=3169589&group_id=108839&atid=651635 -Patch4: htop-0.9-libpagemap.patch +Patch4: htop-1.0-libpagemap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils From e8d343467977fdd6d03c88d6c3b84a0ce88566ac Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Tue, 10 Jul 2012 21:58:59 +0200 Subject: [PATCH 36/63] - Update to 1.0.1 - Should resolve BZ#782272, BZ#815995, BZ#835221 --- .gitignore | 1 + htop.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe4d6ba..96889b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ htop-0.8.3.tar.gz /htop-0.9.tar.gz /htop-1.0.tar.gz +/htop-1.0.1.tar.gz diff --git a/htop.spec b/htop.spec index 8e229b1..55c91d3 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 1.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Interactive process viewer @@ -22,7 +22,7 @@ top(1). %prep %setup -q -%patch4 -p1 -b.pgmap +%patch4 -p1 -b.pgmap -F3 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in @@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Tue Jul 10 2012 Miloš Jakubíček - 1.0.1-1 +- Update to 1.0.1 +- Should resolve BZ#782272, BZ#815995, BZ#835221 + * Tue Feb 07 2012 Miloš Jakubíček - 1.0-1 - Update to 1.0 - Build with --enable-openvz --enable-vserver --enable-taskstats diff --git a/sources b/sources index cc11c26..9859e23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -325112ca7947ea1f6d6441f631e00384 htop-1.0.tar.gz +d3b80d905a6bff03f13896870787f901 htop-1.0.1.tar.gz From 4e7e98ffd3de6b39182624392f0e902d1e2051f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 08:13:45 -0500 Subject: [PATCH 37/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 55c91d3..ed57403 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jul 10 2012 Miloš Jakubíček - 1.0.1-1 - Update to 1.0.1 - Should resolve BZ#782272, BZ#815995, BZ#835221 From 51849b9c4342d9bde0325d65ce32d61427c7cf22 Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Tue, 4 Dec 2012 10:46:09 +0100 Subject: [PATCH 38/63] - Update to 1.0.2 - Dropped libpagemap patch (conflicting with upstream) - Removed BR: libpagemap-devel - Should resolve BZ#859912, BZ#862039, BZ#864495, BZ#874879 --- .gitignore | 1 + htop.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 96889b3..9151391 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ htop-0.8.3.tar.gz /htop-0.9.tar.gz /htop-1.0.tar.gz /htop-1.0.1.tar.gz +/htop-1.0.2.tar.gz diff --git a/htop.spec b/htop.spec index ed57403..d2f7fa9 100644 --- a/htop.spec +++ b/htop.spec @@ -1,20 +1,16 @@ Name: htop -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ URL: http://htop.sourceforge.net/ Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz -# Patch by Petr Holasek (pholasek@redhat.com) -# Filed into upstream bugtracker: -# http://sourceforge.net/tracker/?func=detail&aid=3169589&group_id=108839&atid=651635 -Patch4: htop-1.0-libpagemap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: ncurses-devel, python, libtool, libpagemap-devel +BuildRequires: ncurses-devel, python, libtool %description htop is an interactive text-mode process viewer for Linux, similar to @@ -22,7 +18,6 @@ top(1). %prep %setup -q -%patch4 -p1 -b.pgmap -F3 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in @@ -51,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Fri Nov 09 2012 Miloš Jakubíček - 1.0.2-1 +- Update to 1.0.2 +- Dropped libpagemap patch (conflicting with upstream) +- Removed BR: libpagemap-devel +- Should resolve BZ#859912, BZ#862039, BZ#864495, BZ#874879 + * Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 9859e23..572662c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3b80d905a6bff03f13896870787f901 htop-1.0.1.tar.gz +0d01cca8df3349c74569cefebbd9919e htop-1.0.2.tar.gz From 6eb5a05374305b610185e22190da01fc2e01ceb0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 19:16:00 -0600 Subject: [PATCH 39/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index d2f7fa9..b28829a 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Nov 09 2012 Miloš Jakubíček - 1.0.2-1 - Update to 1.0.2 - Dropped libpagemap patch (conflicting with upstream) From 4d89f0b5e51df0f802f6c6f3ed73154f7ecaeaec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 12:59:16 -0500 Subject: [PATCH 40/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index b28829a..72e4ae1 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From ec56ea2e7c6e5fb2385d31406e6527a4db007d97 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 28 Apr 2014 14:36:47 +0200 Subject: [PATCH 41/63] Update to 1.0.3 --- .gitignore | 1 + htop.spec | 34 +++++++++++++++++++--------------- sources | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 9151391..30d060c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ htop-0.8.3.tar.gz /htop-1.0.tar.gz /htop-1.0.1.tar.gz /htop-1.0.2.tar.gz +/htop-1.0.3.tar.gz diff --git a/htop.spec b/htop.spec index 72e4ae1..2cb04a9 100644 --- a/htop.spec +++ b/htop.spec @@ -1,16 +1,16 @@ -Name: htop -Version: 1.0.2 -Release: 3%{?dist} -Summary: Interactive process viewer - -Group: Applications/System -License: GPL+ -URL: http://htop.sourceforge.net/ -Source0: http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils -BuildRequires: ncurses-devel, python, libtool +Name: htop +Version: 1.0.3 +Release: 1%{?dist} +Summary: Interactive process viewer +Group: Applications/System +License: GPL+ +URL: http://hisham.hm/htop/ +Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: desktop-file-utils +BuildRequires: ncurses-devel +BuildRequires: python +BuildRequires: libtool %description htop is an interactive text-mode process viewer for Linux, similar to @@ -20,8 +20,9 @@ top(1). %setup -q sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in - %build +autoreconf -v -f -i + %configure --enable-openvz --enable-vserver --enable-taskstats \ --enable-unicode --enable-native-affinity --enable-cgroup make %{?_smp_mflags} @@ -44,8 +45,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* - %changelog +* Mon Apr 28 2014 Morten Stevens - 1.0.3-1 +- Update to 1.0.3 +- Should resolve BZ#925557, BZ#987805, BZ#1091943 + * Sat Aug 03 2013 Fedora Release Engineering - 1.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 572662c..7e03899 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d01cca8df3349c74569cefebbd9919e htop-1.0.2.tar.gz +e768b9b55c033d9c1dffda72db3a6ac7 htop-1.0.3.tar.gz From c0533271150c72973b483a97b74882f276790a5a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 15:29:37 -0500 Subject: [PATCH 42/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 2cb04a9..f381ca8 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Apr 28 2014 Morten Stevens - 1.0.3-1 - Update to 1.0.3 - Should resolve BZ#925557, BZ#987805, BZ#1091943 From 76f70265e8d5611fd71fc15216cd122fc0034e4c Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sun, 22 Jun 2014 16:51:47 +0200 Subject: [PATCH 43/63] Enable OOM column score support (BZ#1111922) --- htop.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/htop.spec b/htop.spec index f381ca8..6fb47b3 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -23,8 +23,15 @@ sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Mak %build autoreconf -v -f -i -%configure --enable-openvz --enable-vserver --enable-taskstats \ - --enable-unicode --enable-native-affinity --enable-cgroup +%configure \ + --enable-openvz \ + --enable-vserver \ + --enable-taskstats \ + --enable-unicode \ + --enable-native-affinity \ + --enable-cgroup \ + --enable-oom + make %{?_smp_mflags} %install @@ -46,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Sun Jun 22 2014 Morten Stevens - 1.0.3-3 +- Enable OOM column score support (BZ#1111922) + * Sat Jun 07 2014 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 09d1c65e6a8908dfb2e77e131f9ddb6de0ce651e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 20:44:03 +0000 Subject: [PATCH 44/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 6fb47b3..eeb6656 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 22 2014 Morten Stevens - 1.0.3-3 - Enable OOM column score support (BZ#1111922) From ed7bf034fa9e27c5303a9f2dfa0f9e670131474a Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:27:13 +0100 Subject: [PATCH 45/63] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- htop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index eeb6656..b0628f0 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Sat Feb 21 2015 Till Maas - 1.0.3-5 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Sat Aug 16 2014 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 63dea93cb8b6b05424ffee85820faf42ff5cc6ef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 10:35:09 +0000 Subject: [PATCH 46/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index b0628f0..9c167d7 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Feb 21 2015 Till Maas - 1.0.3-5 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 6e681ada5466ce1eec768507b60c964962c2a1b7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 23:55:37 +0000 Subject: [PATCH 47/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 9c167d7..b15a0c7 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From f0b450fe40fefdc4adf91ca5ae31ac181b659ed5 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 11 Feb 2016 21:12:54 +0100 Subject: [PATCH 48/63] Update to 2.0.0 --- .gitignore | 1 + htop.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 30d060c..340586a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ htop-0.8.3.tar.gz /htop-1.0.1.tar.gz /htop-1.0.2.tar.gz /htop-1.0.3.tar.gz +/htop-2.0.0.tar.gz diff --git a/htop.spec b/htop.spec index b15a0c7..bacece2 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 1.0.3 -Release: 7%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Thu Feb 11 2016 Morten Stevens - 2.0.0-1 +- Update to 2.0.0 (#1306817) + * Wed Feb 03 2016 Fedora Release Engineering - 1.0.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -66,13 +69,13 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ * Sat Aug 16 2014 Fedora Release Engineering - 1.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Sun Jun 22 2014 Morten Stevens - 1.0.3-3 +* Sun Jun 22 2014 Morten Stevens - 1.0.3-3 - Enable OOM column score support (BZ#1111922) * Sat Jun 07 2014 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Mon Apr 28 2014 Morten Stevens - 1.0.3-1 +* Mon Apr 28 2014 Morten Stevens - 1.0.3-1 - Update to 1.0.3 - Should resolve BZ#925557, BZ#987805, BZ#1091943 diff --git a/sources b/sources index 7e03899..c3485df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e768b9b55c033d9c1dffda72db3a6ac7 htop-1.0.3.tar.gz +06f76c7d644ce8ae611c9feb10439a30 htop-2.0.0.tar.gz From 28ef2bf7ec01aab25ea528db0efc5f416b40f7d1 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 15 Feb 2016 15:43:42 +0100 Subject: [PATCH 49/63] Fix for #1308359 --- htop-1.0-libpagemap.patch | 425 --------------------------- htop-2.0.0-fix-buffer-reuse.patch | 22 ++ htop-2.0.0-fix-emptying-column.patch | 25 ++ htop.spec | 10 +- 4 files changed, 56 insertions(+), 426 deletions(-) delete mode 100644 htop-1.0-libpagemap.patch create mode 100644 htop-2.0.0-fix-buffer-reuse.patch create mode 100644 htop-2.0.0-fix-emptying-column.patch diff --git a/htop-1.0-libpagemap.patch b/htop-1.0-libpagemap.patch deleted file mode 100644 index 051e815..0000000 --- a/htop-1.0-libpagemap.patch +++ /dev/null @@ -1,425 +0,0 @@ -diff -Naur htop-1.0/configure.ac.orig htop-1.0/configure.ac ---- htop-1.0/configure.ac.orig 2011-11-21 03:46:48.000000000 +0100 -+++ htop-1.0/configure.ac 2012-02-07 17:21:59.098852884 +0100 -@@ -23,11 +23,13 @@ - - # Checks for libraries. - AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) -+AC_CHECK_LIB([pagemap], [init_pgmap_table], [], [], []) -+AC_CHECK_LIB([pthread], [pthread_create], [], [], []) - - # Checks for header files. - AC_HEADER_DIRENT - AC_HEADER_STDC --AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ -+AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h pthread.h],[:],[ - missing_headers="$missing_headers $ac_header" - ]) - AC_CHECK_HEADERS([execinfo.h],[:],[:]) -diff -Naur htop-1.0/htop.1.orig htop-1.0/htop.1 ---- htop-1.0/htop.1.orig 2012-02-07 17:28:48.935889755 +0100 -+++ htop-1.0/htop.1 2012-02-07 17:27:44.087881744 +0100 -@@ -32,6 +32,9 @@ - \fB\-u \-\-user=USERNAME\fR - Show only the processes of a given user - .TP -+\fB\-p\fR -+Start working thread for pagemap memory stats -+.TP - \fB\-s \-\-sort\-key COLUMN\fR - Sort by this column (use \-\-sort\-key help for a column list) - .TP -diff -Naur htop-1.0/htop.1.in.orig htop-1.0/htop.1.in ---- htop-1.0/htop.1.in.orig 2011-09-27 01:59:36.000000000 +0200 -+++ htop-1.0/htop.1.in 2012-02-07 17:25:23.161867112 +0100 -@@ -32,6 +32,9 @@ - \fB\-u \-\-user=USERNAME\fR - Show only the processes of a given user - .TP -+\fB\-p\fR -+Start working thread for pagemap memory stats -+.TP - \fB\-s \-\-sort\-key COLUMN\fR - Sort by this column (use \-\-sort\-key help for a column list) - .TP -diff -Naur htop-1.0/htop.c.orig htop-1.0/htop.c ---- htop-1.0/htop.c.orig 2011-11-21 03:48:11.000000000 +0100 -+++ htop-1.0/htop.c 2012-02-07 17:36:15.348965585 +0100 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "ProcessList.h" - #include "CRT.h" -@@ -51,6 +52,9 @@ - "-C --no-color Use a monochrome color scheme\n" - "-d --delay=DELAY Set the delay between updates, in tenths of seconds\n" - "-h --help Print this help screen\n" -+#ifdef HAVE_LIBPAGEMAP -+ "-p --pagemap Count memory stats from pagemap kernel interface\n" -+#endif - "-s --sort-key=COLUMN Sort by COLUMN (try --sort-key=help for a list)\n" - "-u --user=USERNAME Show only processes of a given user\n" - "-v --version Print version info\n" -@@ -238,6 +242,16 @@ - ProcessList_printHeader(pl, Panel_getHeader(panel)); - } - -+#ifdef HAVE_LIBPAGEMAP -+static void * pagemapCnt(ProcessList * pl) { -+ while(1) { -+ pl->pagemap_table = init_pgmap_table(pl->pagemap_table); -+ open_pgmap_table(pl->pagemap_table,0); -+ } -+ return; -+} -+#endif -+ - typedef struct IncBuffer_ { - char buffer[INCSEARCH_MAX]; - int index; -@@ -255,6 +269,7 @@ - bool userOnly = false; - uid_t userId = 0; - int usecolors = 1; -+ int pagemap_enable = 0; - TreeType treeType = TREE_TYPE_AUTO; - - int opt, opti=0; -@@ -267,6 +282,9 @@ - {"user", required_argument, 0, 'u'}, - {"no-color", no_argument, 0, 'C'}, - {"no-colour",no_argument, 0, 'C'}, -+#ifdef HAVE_LIBPAGEMAP -+ {"pagemap", no_argument, 0, 'p'}, -+#endif - {0,0,0,0} - }; - int sortKey = 0; -@@ -280,7 +298,7 @@ - setlocale(LC_CTYPE, ""); - - /* Parse arguments */ -- while ((opt = getopt_long(argc, argv, "hvCs:d:u:", long_opts, &opti))) { -+ while ((opt = getopt_long(argc, argv, "hpvCs:d:u:", long_opts, &opti))) { - if (opt == EOF) break; - switch (opt) { - case 'h': -@@ -320,6 +338,11 @@ - case 'C': - usecolors=0; - break; -+#ifdef HAVE_LIBPAGEMAP -+ case 'p': -+ pagemap_enable=1; -+ break; -+#endif - default: - exit(1); - } -@@ -432,6 +455,18 @@ - int ch = ERR; - int closeTimeout = 0; - -+#ifdef HAVE_LIBPAGEMAP -+ // declare threading stuff -+ static pthread_t libpagemap_thread; -+ static pthread_attr_t t_attr; -+ if (pagemap_enable) { -+ // start thread -+ pthread_attr_init(&t_attr); -+ pthread_attr_setdetachstate(&t_attr, PTHREAD_CREATE_DETACHED); -+ pthread_create(&libpagemap_thread, &t_attr, (void * (*)(void *)) &pagemapCnt, (void *) pl); -+ } -+#endif -+ - while (!quit) { - gettimeofday(&tv, NULL); - newTime = ((double)tv.tv_sec * 10) + ((double)tv.tv_usec / 100000); -@@ -912,6 +947,12 @@ - if (settings->changed) - Settings_write(settings); - Header_delete(header); -+#ifdef HAVE_LIBPAGEMAP -+ if (pagemap_enable) { -+ pthread_cancel(libpagemap_thread); -+ free_pgmap_table(pl->pagemap_table); -+ } -+#endif - ProcessList_delete(pl); - FunctionBar_delete((Object*)incFilter.bar); - FunctionBar_delete((Object*)incSearch.bar); -diff -ru --exclude=config.h htop-0.9/htop.h htop-0.9-patched/htop.h ---- htop-0.9/htop.h 2010-11-24 19:45:40.000000000 +0100 -+++ htop-0.9-patched/htop.h 2011-03-09 16:48:37.672644570 +0100 -@@ -17,6 +17,9 @@ - #include - #include - #include -+#ifdef HAVE_LIBPAGEMAP -+#include -+#endif - - #include "ProcessList.h" - #include "CRT.h" -diff -Naur htop-1.0/Process.c.orig htop-1.0/Process.c ---- htop-1.0/Process.c.orig 2011-11-21 03:47:49.000000000 +0100 -+++ htop-1.0/Process.c 2012-02-07 17:41:02.322032224 +0100 -@@ -72,6 +72,9 @@ - #ifdef HAVE_CGROUP - CGROUP, - #endif -+ #ifdef HAVE_LIBPAGEMAP -+ M_USS, M_PSS, M_SWAP, -+ #endif - LAST_PROCESSFIELD - } ProcessField; - -@@ -115,7 +118,7 @@ - #ifdef DEBUG - long int itrealvalue; - unsigned long int vsize; -- long int rss; -+ long 1nt rss; - unsigned long int rlim; - unsigned long int startcode; - unsigned long int endcode; -@@ -139,6 +142,9 @@ - int m_drs; - int m_lrs; - int m_dt; -+ unsigned int m_uss; -+ unsigned int m_pss; -+ unsigned int m_swap; - uid_t st_uid; - float percent_cpu; - float percent_mem; -@@ -198,6 +204,9 @@ - #ifdef HAVE_CGROUP - "CGROUP", - #endif -+#ifdef HAVE_LIBPAGEMAP -+ "M_USS", "M_PSS", "M_SWAP", -+#endif - "*** report bug! ***" - }; - -@@ -223,6 +232,9 @@ - #ifdef HAVE_CGROUP - " CGROUP ", - #endif -+#ifdef HAVE_LIBPAGEMAP -+ " USS ", " PSS ", " SWAP ", -+#endif - "*** report bug! ***" - }; - -@@ -440,6 +452,32 @@ - case M_SIZE: Process_humanNumber(this, str, this->m_size * PAGE_SIZE_KB); return; - case M_RESIDENT: Process_humanNumber(this, str, this->m_resident * PAGE_SIZE_KB); return; - case M_SHARE: Process_humanNumber(this, str, this->m_share * PAGE_SIZE_KB); return; -+ #ifdef HAVE_LIBPAGEMAP -+ case M_USS: -+ if (Process_getuid == 0 && this->pl->pagemap_table != NULL) { -+ Process_humanNumber(this, str, this->m_uss * PAGE_SIZE_KB); -+ return; -+ } else { -+ snprintf(buffer, n, " - "); -+ } -+ break; -+ case M_PSS: -+ if (Process_getuid == 0 && this->pl->pagemap_table != NULL) { -+ Process_humanNumber(this, str, this->m_pss * PAGE_SIZE_KB); -+ return; -+ } else { -+ snprintf(buffer, n, " - "); -+ } -+ break; -+ case M_SWAP: -+ if ((Process_getuid == 0 || Process_getuid == this->st_uid) && this->pl->pagemap_table != NULL) { -+ Process_humanNumber(this, str, this->m_swap * PAGE_SIZE_KB); -+ return; -+ } else { -+ snprintf(buffer, n, " - "); -+ } -+ break; -+ #endif - case ST_UID: snprintf(buffer, n, "%4d ", this->st_uid); break; - case USER: { - if (Process_getuid != (int) this->st_uid) -@@ -677,6 +715,14 @@ - return (p2->m_resident - p1->m_resident); - case M_SHARE: - return (p2->m_share - p1->m_share); -+ #ifdef HAVE_LIBPAGEMAP -+ case M_USS: -+ return (p2->m_uss - p1->m_uss); -+ case M_PSS: -+ return (p2->m_pss - p1->m_pss); -+ case M_SWAP: -+ return (p2->m_swap - p1->m_swap); -+ #endif - case PERCENT_CPU: - return (p2->percent_cpu > p1->percent_cpu ? 1 : -1); - case PERCENT_MEM: -diff -ru --exclude=config.h htop-0.9/Process.h htop-0.9-patched/Process.h ---- htop-0.9/Process.h 2010-11-23 16:56:32.000000000 +0100 -+++ htop-0.9-patched/Process.h 2011-03-09 16:44:07.070449492 +0100 -@@ -74,6 +74,9 @@ - #ifdef HAVE_CGROUP - CGROUP, - #endif -+ #ifdef HAVE_LIBPAGEMAP -+ M_USS, M_PSS, M_SWAP, -+ #endif - LAST_PROCESSFIELD - } ProcessField; - -@@ -117,7 +120,7 @@ - #ifdef DEBUG - long int itrealvalue; - unsigned long int vsize; -- long int rss; -+ long 1nt rss; - unsigned long int rlim; - unsigned long int startcode; - unsigned long int endcode; -@@ -141,6 +144,9 @@ - int m_drs; - int m_lrs; - int m_dt; -+ unsigned int m_uss; -+ unsigned int m_pss; -+ unsigned int m_swap; - uid_t st_uid; - float percent_cpu; - float percent_mem; -diff -Naur htop-1.0/ProcessList.c.orig htop-1.0/ProcessList.c ---- htop-1.0/ProcessList.c.orig 2011-11-21 03:47:37.000000000 +0100 -+++ htop-1.0/ProcessList.c 2012-02-07 17:43:52.289077822 +0100 -@@ -10,6 +10,9 @@ - #include "config.h" - #endif - -+#ifdef HAVE_LIBPAGEMAP -+#include "libpagemap.h" -+#endif - #include "ProcessList.h" - #include "Process.h" - #include "Vector.h" -@@ -28,6 +31,7 @@ - #include - #include - #include -+#include - - #include "debug.h" - #include -@@ -148,6 +152,10 @@ - bool countCPUsFromZero; - const char **treeStr; - -+#ifdef HAVE_LIBPAGEMAP -+ pagemap_tbl * pagemap_table; -+#endif -+ - } ProcessList; - - }*/ -@@ -230,6 +238,9 @@ - this->detailedCPUTime = false; - this->countCPUsFromZero = false; - this->treeStr = NULL; -+#ifdef HAVE_LIBPAGEMAP -+ this->pagemap_table = NULL; -+#endif - - return this; - } -@@ -496,6 +507,29 @@ - return (num == 7); - } - -+#ifdef HAVE_LIBPAGEMAP -+ -+static bool ProcessList_readPagemap(ProcessList* plist ,Process* process, const char * name) { -+ -+ process_pagemap_t* p = NULL; -+ int pid = 0; -+ -+ pid = atoi(name); -+ -+ if ((p = get_single_pgmap(plist->pagemap_table,pid)) == NULL) { -+ process->m_uss = 0; -+ process->m_pss = 0; -+ process->m_swap = 0; -+ } else { -+ process->m_uss = p->uss; -+ process->m_pss = p->pss; -+ process->m_swap = p->swap; -+ } -+ return true; -+} -+ -+#endif -+ - #ifdef HAVE_OPENVZ - - static void ProcessList_readOpenVZData(Process* process, const char* dirname, const char* name) { -@@ -660,6 +694,11 @@ - if (! ProcessList_readStatmFile(process, dirname, name)) - goto errorReadingProcess; - -+ #ifdef HAVE_LIBPAGEMAP -+ if (! ProcessList_readPagemap(this, process, name)) -+ goto errorReadingProcess; -+ #endif -+ - process->show = ! ((hideKernelThreads && Process_isKernelThread(process)) || (hideUserlandThreads && Process_isUserlandThread(process))); - - char command[MAX_NAME+1]; -diff -Naur htop-1.0/ProcessList.h.orig htop-1.0/ProcessList.h ---- htop-1.0/ProcessList.h.orig 2011-11-21 03:49:01.000000000 +0100 -+++ htop-1.0/ProcessList.h 2012-02-07 17:45:46.224110828 +0100 -@@ -14,6 +14,9 @@ - #include "config.h" - #endif - -+#ifdef HAVE_LIBPAGEMAP -+#include "libpagemap.h" -+#endif - #include "Process.h" - #include "Vector.h" - #include "UsersTable.h" -@@ -31,6 +34,7 @@ - #include - #include - #include -+#include - - #include "debug.h" - #include -@@ -150,6 +154,10 @@ - bool countCPUsFromZero; - const char **treeStr; - -+#ifdef HAVE_LIBPAGEMAP -+ pagemap_tbl * pagemap_table; -+#endif -+ - } ProcessList; - - -@@ -175,6 +183,10 @@ - - #endif - -+#ifdef HAVE_LIBPAGEMAP -+ -+#endif -+ - #ifdef HAVE_OPENVZ - - #endif diff --git a/htop-2.0.0-fix-buffer-reuse.patch b/htop-2.0.0-fix-buffer-reuse.patch new file mode 100644 index 0000000..f44e43e --- /dev/null +++ b/htop-2.0.0-fix-buffer-reuse.patch @@ -0,0 +1,22 @@ +From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001 +From: Hisham +Date: Sat, 13 Feb 2016 02:18:28 -0200 +Subject: [PATCH] Fix buffer reuse. + +--- + linux/LinuxProcessList.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c +index 591210e..ec643ab 100644 +--- a/linux/LinuxProcessList.c ++++ b/linux/LinuxProcessList.c +@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn + } + + static void setCommand(Process* process, const char* command, int len) { +- if (process->comm && process->commLen <= len) { ++ if (process->comm && process->commLen >= len) { + strncpy(process->comm, command, len + 1); + } else { + free(process->comm); diff --git a/htop-2.0.0-fix-emptying-column.patch b/htop-2.0.0-fix-emptying-column.patch new file mode 100644 index 0000000..1b39bef --- /dev/null +++ b/htop-2.0.0-fix-emptying-column.patch @@ -0,0 +1,25 @@ +From 0e3cf6975f96291fa203332aad9e44086ff8f2f2 Mon Sep 17 00:00:00 2001 +From: Hisham +Date: Fri, 12 Feb 2016 23:33:53 -0200 +Subject: [PATCH] Fix crash when emptying column. Closes #381. + +--- + MetersPanel.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/MetersPanel.c b/MetersPanel.c +index bdbe83e..302b6d1 100644 +--- a/MetersPanel.c ++++ b/MetersPanel.c +@@ -50,7 +50,10 @@ static void MetersPanel_delete(Object* object) { + void MetersPanel_setMoving(MetersPanel* this, bool moving) { + Panel* super = (Panel*) this; + this->moving = moving; +- ((ListItem*)Panel_getSelected(super))->moving = moving; ++ ListItem* selected = (ListItem*)Panel_getSelected(super); ++ if (selected) { ++ selected->moving = moving; ++ } + if (!moving) { + Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]); + Panel_setDefaultBar(super); diff --git a/htop.spec b/htop.spec index bacece2..7c736a1 100644 --- a/htop.spec +++ b/htop.spec @@ -1,11 +1,13 @@ Name: htop Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ URL: http://hisham.hm/htop/ Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz +Patch0: htop-2.0.0-fix-emptying-column.patch +Patch1: htop-2.0.0-fix-buffer-reuse.patch BuildRequires: desktop-file-utils BuildRequires: ncurses-devel @@ -18,6 +20,8 @@ top(1). %prep %setup -q +%patch0 -p1 +%patch1 -p1 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in %build @@ -53,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Mon Feb 15 2016 Morten Stevens - 2.0.0-2 +- Fix buffer reuse (#1308359) +- Fix crash when emptying column + * Thu Feb 11 2016 Morten Stevens - 2.0.0-1 - Update to 2.0.0 (#1306817) From 8d918a862bc0e56391bb835c46b25eb9eb3eefcf Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 8 Mar 2016 14:05:51 +0100 Subject: [PATCH 50/63] Update to 2.0.1 --- .gitignore | 1 + htop.spec | 11 +++++------ sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 340586a..d7c7169 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ htop-0.8.3.tar.gz /htop-1.0.2.tar.gz /htop-1.0.3.tar.gz /htop-2.0.0.tar.gz +/htop-2.0.1.tar.gz diff --git a/htop.spec b/htop.spec index 7c736a1..20a86f4 100644 --- a/htop.spec +++ b/htop.spec @@ -1,13 +1,11 @@ Name: htop -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ URL: http://hisham.hm/htop/ Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz -Patch0: htop-2.0.0-fix-emptying-column.patch -Patch1: htop-2.0.0-fix-buffer-reuse.patch BuildRequires: desktop-file-utils BuildRequires: ncurses-devel @@ -20,8 +18,6 @@ top(1). %prep %setup -q -%patch0 -p1 -%patch1 -p1 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in %build @@ -57,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Tue Mar 08 2016 Morten Stevens - 2.0.1-1 +- Update to 2.0.1 (#1315522) + * Mon Feb 15 2016 Morten Stevens - 2.0.0-2 - Fix buffer reuse (#1308359) - Fix crash when emptying column diff --git a/sources b/sources index c3485df..8b66973 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06f76c7d644ce8ae611c9feb10439a30 htop-2.0.0.tar.gz +f75fe92b4defaa80d99109830f34b5e2 htop-2.0.1.tar.gz From 566ade47d69fd79673740efbcfd59a4e2a64bcc8 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Sun, 24 Jul 2016 11:57:34 +0200 Subject: [PATCH 51/63] Update to 2.0.2 --- .gitignore | 1 + htop-2.0.0-fix-buffer-reuse.patch | 22 ---------------------- htop-2.0.0-fix-emptying-column.patch | 25 ------------------------- htop.spec | 5 ++++- sources | 2 +- 5 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 htop-2.0.0-fix-buffer-reuse.patch delete mode 100644 htop-2.0.0-fix-emptying-column.patch diff --git a/.gitignore b/.gitignore index d7c7169..3ffc672 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ htop-0.8.3.tar.gz /htop-1.0.3.tar.gz /htop-2.0.0.tar.gz /htop-2.0.1.tar.gz +/htop-2.0.2.tar.gz diff --git a/htop-2.0.0-fix-buffer-reuse.patch b/htop-2.0.0-fix-buffer-reuse.patch deleted file mode 100644 index f44e43e..0000000 --- a/htop-2.0.0-fix-buffer-reuse.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001 -From: Hisham -Date: Sat, 13 Feb 2016 02:18:28 -0200 -Subject: [PATCH] Fix buffer reuse. - ---- - linux/LinuxProcessList.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c -index 591210e..ec643ab 100644 ---- a/linux/LinuxProcessList.c -+++ b/linux/LinuxProcessList.c -@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess* process, const char* dirn - } - - static void setCommand(Process* process, const char* command, int len) { -- if (process->comm && process->commLen <= len) { -+ if (process->comm && process->commLen >= len) { - strncpy(process->comm, command, len + 1); - } else { - free(process->comm); diff --git a/htop-2.0.0-fix-emptying-column.patch b/htop-2.0.0-fix-emptying-column.patch deleted file mode 100644 index 1b39bef..0000000 --- a/htop-2.0.0-fix-emptying-column.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0e3cf6975f96291fa203332aad9e44086ff8f2f2 Mon Sep 17 00:00:00 2001 -From: Hisham -Date: Fri, 12 Feb 2016 23:33:53 -0200 -Subject: [PATCH] Fix crash when emptying column. Closes #381. - ---- - MetersPanel.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/MetersPanel.c b/MetersPanel.c -index bdbe83e..302b6d1 100644 ---- a/MetersPanel.c -+++ b/MetersPanel.c -@@ -50,7 +50,10 @@ static void MetersPanel_delete(Object* object) { - void MetersPanel_setMoving(MetersPanel* this, bool moving) { - Panel* super = (Panel*) this; - this->moving = moving; -- ((ListItem*)Panel_getSelected(super))->moving = moving; -+ ListItem* selected = (ListItem*)Panel_getSelected(super); -+ if (selected) { -+ selected->moving = moving; -+ } - if (!moving) { - Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]); - Panel_setDefaultBar(super); diff --git a/htop.spec b/htop.spec index 20a86f4..052ea43 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: Interactive process viewer Group: Applications/System @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Sun Jul 24 2016 Morten Stevens - 2.0.2-1 +- Update to 2.0.2 (#1359437) + * Tue Mar 08 2016 Morten Stevens - 2.0.1-1 - Update to 2.0.1 (#1315522) diff --git a/sources b/sources index 8b66973..93229a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f75fe92b4defaa80d99109830f34b5e2 htop-2.0.1.tar.gz +7d354d904bad591a931ad57e99fea84a htop-2.0.2.tar.gz From 54a68b973b13f9d9f97c7b72a3ebb9d0c88cba94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 12:45:01 +0000 Subject: [PATCH 52/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 052ea43..0afd052 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jul 24 2016 Morten Stevens - 2.0.2-1 - Update to 2.0.2 (#1359437) From e53c1ea4493d413796a6642d45a2e76be2ab5fb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 12:52:07 +0000 Subject: [PATCH 53/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 0afd052..979a5ab 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4c58913ce7838409ada08c20449f906186ca1054 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 23:32:47 +0000 Subject: [PATCH 54/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- htop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 979a5ab..91d01c9 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interactive process viewer Group: Applications/System License: GPL+ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9454e02a36fbc36909ae616bc1a8a8aa0b559189 Mon Sep 17 00:00:00 2001 From: vascom Date: Sun, 10 Sep 2017 08:14:38 +0000 Subject: [PATCH 55/63] Update htop.spec I hope this cleanup changes can make spec file more simple and accurate with Fedora packaging guidelines. --- htop.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/htop.spec b/htop.spec index 91d01c9..f19f626 100644 --- a/htop.spec +++ b/htop.spec @@ -1,9 +1,8 @@ Name: htop Version: 2.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Interactive process viewer -Group: Applications/System -License: GPL+ +License: GPLv2+ URL: http://hisham.hm/htop/ Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz @@ -17,7 +16,7 @@ htop is an interactive text-mode process viewer for Linux, similar to top(1). %prep -%setup -q +%autosetup sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in %build @@ -32,11 +31,11 @@ autoreconf -v -f -i --enable-cgroup \ --enable-oom -make %{?_smp_mflags} +%make_build %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install #remove empty direcories rm -rf $RPM_BUILD_ROOT%{libdir} @@ -46,13 +45,16 @@ rm -rf $RPM_BUILD_ROOT%{includedir} rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS ChangeLog README +%license COPYING %{_bindir}/htop %{_datadir}/pixmaps/htop.png %{_mandir}/man1/htop.1* %changelog +* Sun Sep 10 2017 Vasiliy N. Glazov - 2.0.2-5 +- Cleanup spec + * Wed Aug 02 2017 Fedora Release Engineering - 2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From dc95ca7045ead21b00d2eb0e8506f561c529561b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 16:30:07 +0000 Subject: [PATCH 56/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 f19f626..fa763ee 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ %{_mandir}/man1/htop.1* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Sep 10 2017 Vasiliy N. Glazov - 2.0.2-5 - Cleanup spec From fbc24211655a4b6c4356222cb3f2cf2e5f914166 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 14 Feb 2018 18:40:03 -0500 Subject: [PATCH 57/63] Update to 2.1.0 Spec cleanup drop unused configure options Install desktop file (fixes bz#1541785) --- .gitignore | 1 + htop.spec | 25 +++++++++++-------------- sources | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 3ffc672..6500f56 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ htop-0.8.3.tar.gz /htop-2.0.0.tar.gz /htop-2.0.1.tar.gz /htop-2.0.2.tar.gz +/htop-2.1.0.tar.gz diff --git a/htop.spec b/htop.spec index fa763ee..ec40cf8 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop -Version: 2.0.2 -Release: 6%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -20,38 +20,35 @@ top(1). sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in %build -autoreconf -v -f -i - %configure \ --enable-openvz \ --enable-vserver \ --enable-taskstats \ --enable-unicode \ - --enable-native-affinity \ - --enable-cgroup \ - --enable-oom + --enable-cgroup %make_build %install -rm -rf $RPM_BUILD_ROOT %make_install -#remove empty direcories -rm -rf $RPM_BUILD_ROOT%{libdir} -rm -rf $RPM_BUILD_ROOT%{includedir} - -# remove desktop file -rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %files %doc AUTHORS ChangeLog README %license COPYING %{_bindir}/htop %{_datadir}/pixmaps/htop.png +%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Wed Feb 14 2018 Mukundan Ragavan - 2.1.0-1 +- Update to 2.1.0 +- Spec cleanup +- drop unused configure options +- Install desktop file (fixes bz#1541785) + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 93229a3..75cf552 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d354d904bad591a931ad57e99fea84a htop-2.0.2.tar.gz +SHA512 (htop-2.1.0.tar.gz) = 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb From 004aaf4a4af9ef0519c37f8aabee28efc905ef5d Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 30 May 2018 18:15:32 -0400 Subject: [PATCH 58/63] Update to 2.2.0 --- .gitignore | 1 + htop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6500f56..23a555c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ htop-0.8.3.tar.gz /htop-2.0.1.tar.gz /htop-2.0.2.tar.gz /htop-2.1.0.tar.gz +/htop-2.2.0.tar.gz diff --git a/htop.spec b/htop.spec index ec40cf8..2308cd1 100644 --- a/htop.spec +++ b/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Interactive process viewer License: GPLv2+ @@ -43,6 +43,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Wed May 30 2018 Mukundan Ragavan - 2.2.0-1 +- Update to 2.2.0 + * Wed Feb 14 2018 Mukundan Ragavan - 2.1.0-1 - Update to 2.1.0 - Spec cleanup diff --git a/sources b/sources index 75cf552..33c9564 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (htop-2.1.0.tar.gz) = 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb +SHA512 (htop-2.2.0.tar.gz) = ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e From f02f92ff02673ca0968b0d6e4dce20c1a557e9de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:06:26 +0000 Subject: [PATCH 59/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 2308cd1..5c42e9b 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -43,6 +43,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed May 30 2018 Mukundan Ragavan - 2.2.0-1 - Update to 2.2.0 From 3ac26d8ce3107699349579343e88e4dc53669155 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 16 Jan 2019 21:42:41 -0500 Subject: [PATCH 60/63] Fix crash when launched with "-s" flag (bug# 1666551) --- htop.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 5c42e9b..fda04ac 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -19,6 +19,11 @@ top(1). %autosetup sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in +# 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 %configure \ --enable-openvz \ @@ -43,6 +48,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Wed Jan 16 2019 Mukundan Ragavan - 2.2.0-3 +- Fix crash when launched with "-s" flag (bug# 1666551) + * Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8efb15396488f610caac91a2ddd9fc0dd349bd0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 02:26:55 +0000 Subject: [PATCH 61/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 fda04ac..7f6a4a1 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -48,6 +48,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 16 2019 Mukundan Ragavan - 2.2.0-3 - Fix crash when launched with "-s" flag (bug# 1666551) From 8279ae7438d45f178d1541010ca4180c7a67086b Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Tue, 25 Jun 2019 18:17:37 +0000 Subject: [PATCH 62/63] Fix python deps for epel 8 --- htop.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htop.spec b/htop.spec index 7f6a4a1..83ed8fd 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Interactive process viewer License: GPLv2+ URL: http://hisham.hm/htop/ @@ -8,7 +8,12 @@ Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: ncurses-devel +%if 0%{?rhel} >= 8 +BuildRequires: platform-python +BuildRequires: /usr/bin/pathfix.py +%else BuildRequires: python +%endif BuildRequires: libtool %description @@ -18,6 +23,9 @@ 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 # fix parsing -s on the command line # https://github.com/hishamhm/htop/pull/790/commits/9d03d6178c23e6ebd5dd67339466e0a7e0d1d1a8 @@ -48,6 +56,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/htop.1* %changelog +* Tue Jun 25 2019 Pablo Greco - 2.2.0-5 +- Fix python deps for epel 8 + * Fri Feb 01 2019 Fedora Release Engineering - 2.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 80c8de9d279605429a1acfdfe75ea8d74a8916d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 08:36:50 +0000 Subject: [PATCH 63/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 83ed8fd..0313294 100644 --- a/htop.spec +++ b/htop.spec @@ -1,6 +1,6 @@ Name: htop Version: 2.2.0 -Release: 5%{?dist} +Release: 6%{?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 +* Thu Jul 25 2019 Fedora Release Engineering - 2.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 25 2019 Pablo Greco - 2.2.0-5 - Fix python deps for epel 8