From 32a007d969498d6697da577e5c03994f7cf15f269f16da8a93331620075dcbc1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 20 Feb 2015 15:05:48 +0000 Subject: [PATCH] Accepting request 286981 from home:hurhaj:branches:Base:System - Cleanup of spec file with spec-cleaner. - Enable oom score watching and native-affinity OBS-URL: https://build.opensuse.org/request/show/286981 OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=27 --- htop.changes | 6 ++++++ htop.spec | 32 +++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htop.changes b/htop.changes index 70ac8d6..6a591db 100644 --- a/htop.changes +++ b/htop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 20 13:38:40 UTC 2015 - jhura@suse.com + +- Cleanup of spec file with spec-cleaner. +- Enable oom score watching and native-affinity + ------------------------------------------------------------------- Mon May 19 18:57:58 UTC 2014 - dmitry_r@opensuse.org diff --git a/htop.spec b/htop.spec index f8e77dc..7c59ce7 100644 --- a/htop.spec +++ b/htop.spec @@ -1,7 +1,7 @@ # # spec file for package htop # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,13 +26,13 @@ Url: http://hisham.hm/htop Source0: http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz Patch0: htop-desktop-file-fix-thoenig-01.patch Patch1: htop-stdgnu.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: ncurses-devel BuildRequires: python BuildRequires: update-desktop-files -Recommends: strace Recommends: lsof +Recommends: strace +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description htop is an interactive text-mode process viewer for Linux. It aims to @@ -40,32 +40,26 @@ be a better 'top' and requires ncurses. It is tested with Linux 2.6, but is also reported to work (and was originally developed) with the 2.4 series. - - -Authors: --------- - Hisham H. Muhammad - %prep -%setup -%patch0 -p0 +%setup -q +%patch0 %patch1 -p1 %build -export CFLAGS="%{optflags} `ncursesw6-config --cflags`" -export LDFLAGS="`ncursesw6-config --libs`" -autoreconf -fiv +autoreconf -fi %configure \ - --enable-unicode \ --enable-taskstats \ - --enable-cgroup + --enable-unicode \ + --enable-native-affinity \ + --enable-cgroup \ + --enable-oom make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" -%suse_update_desktop_file -i %name System Monitor +make DESTDIR=%{buildroot} install %{?_smp_mflags} +%suse_update_desktop_file -i %{name} System Monitor -%files +%files %defattr(-,root,root) %doc COPYING %{_bindir}/%{name}