From 51849b9c4342d9bde0325d65ce32d61427c7cf22 Mon Sep 17 00:00:00 2001 From: Milos Jakubicek Date: Tue, 4 Dec 2012 10:46:09 +0100 Subject: [PATCH] - 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